diff options
author | David Yip <yipdw@member.fsf.org> | 2018-02-23 15:05:00 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-23 15:05:00 -0600 |
commit | f53953d28a24fe65f1ca66d85a1416ba30dcda86 (patch) | |
tree | 4e9e2214629b46ddc98fdce358abc812112f13fa /Gemfile.lock | |
parent | 544543e40a723d9719f5571bd4c3455a6a69fccd (diff) | |
parent | f2f19e1f8a3a048cf0a0041ae54d912acfea7742 (diff) |
Merge pull request #369 from KnzkDev/merge-upstream
Merge with upstream @ e668180044560e28bdc5eef94744c210013efcda
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d4ebd0a40..1905cf3e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,6 +185,7 @@ GEM faraday (0.14.0) multipart-post (>= 1.2, < 3) fast_blank (1.0.0) + fastimage (2.1.1) ffi (1.9.18) fog-core (1.45.0) builder @@ -302,6 +303,7 @@ GEM mini_mime (>= 0.1.1) mario-redis-lock (1.2.0) redis (~> 3, >= 3.0.5) + memory_profiler (0.9.10) method_source (0.9.0) microformats (4.0.7) json @@ -644,6 +646,7 @@ DEPENDENCIES fabrication (~> 2.18) faker (~> 1.7) fast_blank (~> 1.0) + fastimage fog-core (~> 1.45) fog-local (~> 0.4) fog-openstack (~> 0.1) @@ -666,6 +669,7 @@ DEPENDENCIES link_header (~> 0.0) lograge (~> 0.7) mario-redis-lock (~> 1.2) + memory_profiler microformats (~> 4.0) mime-types (~> 3.1) nokogiri (~> 1.8) |