summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-03-25 12:51:46 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-03-26 20:29:40 -0400
commitbd31b4503daf6048bbc57f975d6829c6575daeec (patch)
tree1c758561132756824df2e6b5460d23c1ad89abf3 /Gemfile.lock
parent57b0db34a5f5a146cbd2f881ee209ec73da03d51 (diff)
downloadgitlab-ce-bd31b4503daf6048bbc57f975d6829c6575daeec.tar.gz
Update flay 2.6.1 -> 2.8.1
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock11
1 files changed, 7 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e3f32be70d8..6d72ff10fb7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -201,7 +201,9 @@ GEM
multi_json
ffaker (2.4.0)
ffi (1.9.10)
- flay (2.6.1)
+ flay (2.8.1)
+ erubis (~> 2.7.0)
+ path_expander (~> 1.0)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
flowdock (0.7.1)
@@ -519,6 +521,7 @@ GEM
activerecord (>= 4.0, < 5.1)
parser (2.4.0.0)
ast (~> 2.2)
+ path_expander (1.0.1)
pg (0.18.4)
poltergeist (1.9.0)
capybara (~> 2.1)
@@ -672,7 +675,7 @@ GEM
ruby-progressbar (1.8.1)
ruby-saml (1.4.1)
nokogiri (>= 1.5.10)
- ruby_parser (3.8.2)
+ ruby_parser (3.8.4)
sexp_processor (~> 4.1)
rubyntlm (0.5.2)
rubypants (0.2.0)
@@ -704,7 +707,7 @@ GEM
sentry-raven (2.0.2)
faraday (>= 0.7.6, < 0.10.x)
settingslogic (2.0.9)
- sexp_processor (4.7.0)
+ sexp_processor (4.8.0)
sham_rack (1.3.6)
rack
shoulda-matchers (2.8.0)
@@ -881,7 +884,7 @@ DEPENDENCIES
email_spec (~> 1.6.0)
factory_girl_rails (~> 4.7.0)
ffaker (~> 2.4)
- flay (~> 2.6.1)
+ flay (~> 2.8.0)
fog-aws (~> 0.9)
fog-core (~> 1.40)
fog-google (~> 0.5)