diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-27 03:53:31 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-27 03:53:31 +0300 |
| commit | 843694f90270e290f164bed68362500c9e331a46 (patch) | |
| tree | 0e20cc09df536365db817ba8aef4c77d3d0c684e /Gemfile | |
| parent | 6afd69f4445cc0688aa1695389eb3f79033e3121 (diff) | |
| parent | de3b7d9c522db8d129a64f2b86297cf90413cb1e (diff) | |
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -42,7 +42,7 @@ gem 'rqrcode-rails3', '~> 0.1.7' gem 'attr_encrypted', '~> 1.3.4' # Browser detection -gem "browser", '~> 0.8.0' +gem "browser", '~> 1.0.0' # Extracting information from a git repository # Provide access to Gitlab::Git library @@ -285,7 +285,7 @@ gem "newrelic_rpm", '~> 3.9.4.245' gem 'octokit', '~> 3.7.0' -gem "mail_room", "~> 0.4.0" +gem "mail_room", "~> 0.4.1" gem 'email_reply_parser', '~> 0.5.8' |