diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-14 11:38:44 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-14 11:38:44 +0200 |
commit | 1b62b86fdd1ad98e680c534f05fb32ff6e23fca4 (patch) | |
tree | c585b79f1a646588328b2c8f4741dea700783b89 /Gemfile | |
parent | 60e0137c864e26fee0120dc4447bb95acc46ce51 (diff) | |
parent | 0c0ef7dfb6afb1695b62037fc0fa5aba6ce697d7 (diff) | |
download | gitlab-ce-1b62b86fdd1ad98e680c534f05fb32ff6e23fca4.tar.gz |
Merge remote-tracking branch 'origin/master' into artifacts-expire-date
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -248,7 +248,7 @@ end group :development do gem "foreman" - gem 'brakeman', '~> 3.2.0', require: false + gem 'brakeman', '~> 3.3.0', require: false gem 'letter_opener_web', '~> 1.3.0' gem 'quiet_assets', '~> 1.0.2' |