diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-01-19 10:08:11 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-01-19 10:08:11 -0600 |
| commit | 2b37e4c1995284a4871d6d7077b0884e95c2496e (patch) | |
| tree | 615e0a3c063ac7e93001434a4a0932cb061e8cc9 /Gemfile | |
| parent | f928e19cb572b34d93baaa5e3040d99fc5ba9939 (diff) | |
| parent | 52762df285751dec4e54c4c55be5bbecb3bd4fc9 (diff) | |
| download | gitlab-ce-2b37e4c1995284a4871d6d7077b0884e95c2496e.tar.gz | |
Merge branch 'master' into copy-as-md
# Conflicts:
# app/assets/javascripts/lib/utils/common_utils.js.es6
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -252,10 +252,9 @@ end group :development do gem 'foreman', '~> 0.78.0' - gem 'brakeman', '~> 3.3.0', require: false + gem 'brakeman', '~> 3.4.0', require: false gem 'letter_opener_web', '~> 1.3.0' - gem 'rerun', '~> 0.11.0' gem 'bullet', '~> 5.2.0', require: false gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false gem 'web-console', '~> 2.0' @@ -286,7 +285,7 @@ group :development, :test do gem 'minitest', '~> 5.7.0' # Generate Fake data - gem 'ffaker', '~> 2.0.0' + gem 'ffaker', '~> 2.4' gem 'capybara', '~> 2.6.2' gem 'capybara-screenshot', '~> 1.0.0' |