diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-28 22:13:31 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-28 22:13:31 +0200 |
| commit | 3d3c7e743fbd5164de4876e8ce390dcc88e275c1 (patch) | |
| tree | c3604e54c16053e21cfde5f163404867b81ca18d /Gemfile.lock | |
| parent | 25a42a56cf4da95e8725b988f2b940d8b293a952 (diff) | |
| parent | 84b40a346a46ca75e7a8981999c6b74187328435 (diff) | |
| download | gitlab-ce-3d3c7e743fbd5164de4876e8ce390dcc88e275c1.tar.gz | |
Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq into vicvega-check_browser_version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
app/assets/stylesheets/generic/common.scss
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0d089305fe5..554223b83c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,6 +50,7 @@ GEM debug_inspector (>= 0.0.1) bootstrap-sass (3.0.3.0) sass (~> 3.2) + browser (0.7.2) builder (3.2.2) capybara (2.2.1) mime-types (>= 1.16) @@ -614,6 +615,7 @@ DEPENDENCIES better_errors binding_of_caller bootstrap-sass (~> 3.0) + browser capybara (~> 2.2.1) carrierwave coffee-rails |