diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-26 17:53:31 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-26 17:53:31 -0700 |
| commit | 843694f90270e290f164bed68362500c9e331a46 (patch) | |
| tree | 0e20cc09df536365db817ba8aef4c77d3d0c684e /Gemfile.lock | |
| parent | 6afd69f4445cc0688aa1695389eb3f79033e3121 (diff) | |
| parent | de3b7d9c522db8d129a64f2b86297cf90413cb1e (diff) | |
| download | gitlab-ce-843694f90270e290f164bed68362500c9e331a46.tar.gz | |
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b810f2fdd4e..97e4c258615 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,7 +82,7 @@ GEM ruby_parser (~> 3.7.0) sass (~> 3.0) terminal-table (~> 1.4) - browser (0.8.0) + browser (1.0.0) builder (3.2.2) byebug (6.0.2) cal-heatmap-rails (0.0.1) @@ -388,7 +388,7 @@ GEM systemu (~> 2.6.2) mail (2.6.3) mime-types (>= 1.16, < 3) - mail_room (0.4.0) + mail_room (0.4.1) method_source (0.8.2) mime-types (1.25.1) mimemagic (0.3.0) @@ -790,7 +790,7 @@ DEPENDENCIES binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.0) brakeman - browser (~> 0.8.0) + browser (~> 1.0.0) byebug cal-heatmap-rails (~> 0.0.1) capybara (~> 2.4.0) @@ -846,7 +846,7 @@ DEPENDENCIES jquery-ui-rails (~> 4.2.1) kaminari (~> 0.15.1) letter_opener (~> 1.1.2) - mail_room (~> 0.4.0) + mail_room (~> 0.4.1) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.3.16) |