Merge remote-tracking branch 'upstream/pull/3770'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 718bd262b57ec13d558c7609d2cf0131e30ae428..cdbd48d04f8da616525af7c2ec2f2fc343ee1b0a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -76,7 +76,7 @@ gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "omniauth-windowslive"
 
 # Doorkeeper for OAuth2
 gem "omniauth-windowslive"
 
 # Doorkeeper for OAuth2

-gem "doorkeeper", "~> 5.5.4"
+gem "doorkeeper"

 gem "doorkeeper-i18n"
 
 # Markdown formatting support
 gem "doorkeeper-i18n"
 
 # Markdown formatting support


@@ -152,7 +152,7 @@ group :test do
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"

-  gem "rubocop-rails"
+  gem "rubocop-rails", "= 2.16.1"

   gem "rubocop-rake"
   gem "selenium-webdriver"
   gem "simplecov", :require => false
   gem "rubocop-rake"
   gem "selenium-webdriver"
   gem "simplecov", :require => false