summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-01-17 08:34:07 -0500
committerPhil Hughes <me@iamphill.com>2017-01-17 08:34:07 -0500
commitc0ba747c586ff7f5f42097a0e49eace30c57ebdf (patch)
tree89b58aa0b6162f4aee0bd8f834cc65e12e6c6c85 /Gemfile.lock
parentdc623cf44e691cfe3e53decf66e36c25394dadb3 (diff)
parente7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1 (diff)
downloadgitlab-ce-c0ba747c586ff7f5f42097a0e49eace30c57ebdf.tar.gz
Merge branch 'master' into go-go-gadget-webpack
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock32
1 files changed, 14 insertions, 18 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7f5043a4e5d..7ec1f2df5e9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -198,7 +198,7 @@ GEM
faraday_middleware-multi_json (0.0.6)
faraday_middleware
multi_json
- ffaker (2.0.0)
+ ffaker (2.4.0)
ffi (1.9.10)
flay (2.6.1)
ruby_parser (~> 3.0)
@@ -407,9 +407,6 @@ GEM
xml-simple
licensee (8.0.0)
rugged (>= 0.24b)
- listen (3.0.5)
- rb-fsevent (>= 0.9.3)
- rb-inotify (>= 0.9)
little-plugger (1.1.4)
logging (2.1.0)
little-plugger (~> 1.1)
@@ -580,9 +577,6 @@ GEM
rainbow (2.1.0)
raindrops (0.17.0)
rake (10.5.0)
- rb-fsevent (0.9.6)
- rb-inotify (0.9.5)
- ffi (>= 0.5.0)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
rdoc (4.2.2)
@@ -611,8 +605,6 @@ GEM
redis-store (1.2.0)
redis (>= 2.2)
request_store (1.3.1)
- rerun (0.11.0)
- listen (~> 3.0)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
rest-client (2.0.0)
@@ -675,12 +667,17 @@ GEM
sanitize (2.1.0)
nokogiri (>= 1.4.4)
sass (3.4.22)
- sass-rails (5.0.6)
- railties (>= 4.0.0, < 6)
- sass (~> 3.1)
- sprockets (>= 2.8, < 4.0)
- sprockets-rails (>= 2.0, < 4.0)
- tilt (>= 1.1, < 3)
+ sassc (1.11.1)
+ bundler
+ ffi (~> 1.9.6)
+ sass (>= 3.3.0)
+ sassc-rails (1.3.0)
+ railties (>= 4.0.0)
+ sass
+ sassc (~> 1.9)
+ sprockets (> 2.11)
+ sprockets-rails
+ tilt
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
@@ -873,7 +870,7 @@ DEPENDENCIES
email_reply_trimmer (~> 0.1)
email_spec (~> 1.6.0)
factory_girl_rails (~> 4.7.0)
- ffaker (~> 2.0.0)
+ ffaker (~> 2.4)
flay (~> 2.6.1)
fog-aws (~> 0.9)
fog-core (~> 1.40)
@@ -964,7 +961,6 @@ DEPENDENCIES
redis-namespace (~> 1.5.2)
redis-rails (~> 5.0.1)
request_store (~> 1.3)
- rerun (~> 0.11.0)
responders (~> 2.0)
rouge (~> 2.0)
rqrcode-rails3 (~> 0.1.7)
@@ -976,7 +972,7 @@ DEPENDENCIES
ruby-prof (~> 0.16.2)
rugged (~> 0.24.0)
sanitize (~> 2.0)
- sass-rails (~> 5.0.6)
+ sassc-rails (~> 1.3.0)
scss_lint (~> 0.47.0)
seed-fu (~> 2.3.5)
select2-rails (~> 3.5.9)