diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-11-26 12:30:28 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-11-26 12:30:28 +0200 |
| commit | 3e0fe27627f5b074a35ce2e1a0794f869f8abc15 (patch) | |
| tree | ebfdb7135c683f6687a15f4ba6f3323ae619bca0 /Gemfile | |
| parent | 38489d8d7d0a352789c23d3bf9cadb169f765d5b (diff) | |
| parent | 1befbbf57dddc23761558f21017294c950d6d3b7 (diff) | |
| download | gitlab-ce-3e0fe27627f5b074a35ce2e1a0794f869f8abc15.tar.gz | |
Merge remote-tracking branch 'origin/master' into rails_update_to_4_2
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -19,7 +19,7 @@ gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 3.5.2' gem 'devise-async', '~> 0.9.0' -gem 'doorkeeper', '~> 2.1.3' +gem 'doorkeeper', '~> 2.2.0' gem 'omniauth', '~> 1.2.2' gem 'omniauth-bitbucket', '~> 0.0.2' gem 'omniauth-facebook', '~> 3.0.0' @@ -65,9 +65,6 @@ gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # based on human-friendly examples gem "stamp", '~> 0.6.0' -# Enumeration fields -gem 'enumerize', '~> 0.7.0' - # Pagination gem "kaminari", "~> 0.16.3" @@ -157,7 +154,7 @@ gem "gemnasium-gitlab-service", "~> 0.2" gem "slack-notifier", "~> 1.2.0" # Asana integration -gem 'asana', '~> 0.0.6' +gem 'asana', '~> 0.4.0' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' |