summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-02 19:30:09 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-02 19:30:09 -0800
commit4f1d1fc51baf396d49f6b159c84e15194706847c (patch)
tree3b4ff8c22e5eaa4276813d661b37192d3f538994 /config
parent7dad2663a671be5cc70db63333dfe033984452d0 (diff)
downloadgitlab-ce-4f1d1fc51baf396d49f6b159c84e15194706847c.tar.gz
Convert hashes to ruby 1.9 style
Diffstat (limited to 'config')
-rw-r--r--config/initializers/carrierwave.rb10
-rw-r--r--config/initializers/doorkeeper.rb4
-rw-r--r--config/routes.rb6
3 files changed, 10 insertions, 10 deletions
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index d0065b63e54..10dfc30a0c5 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -23,11 +23,11 @@ if File.exists?(aws_file)
if Rails.env.test?
Fog.mock!
connection = ::Fog::Storage.new(
- :aws_access_key_id => AWS_CONFIG['access_key_id'],
- :aws_secret_access_key => AWS_CONFIG['secret_access_key'],
- :provider => 'AWS',
- :region => AWS_CONFIG['region']
+ aws_access_key_id: AWS_CONFIG['access_key_id'],
+ aws_secret_access_key: AWS_CONFIG['secret_access_key'],
+ provider: 'AWS',
+ region: AWS_CONFIG['region']
)
- connection.directories.create(:key => AWS_CONFIG['bucket'])
+ connection.directories.create(key: AWS_CONFIG['bucket'])
end
end
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 4819ab273dc..e9b843e29b4 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -43,10 +43,10 @@ Doorkeeper.configure do
force_ssl_in_redirect_uri false
# Provide support for an owner to be assigned to each registered application (disabled by default)
- # Optional parameter :confirmation => true (default false) if you want to enforce ownership of
+ # Optional parameter confirmation: true (default false) if you want to enforce ownership of
# a registered application
# Note: you must also run the rails g doorkeeper:application_owner generator to provide the necessary support
- enable_application_owner :confirmation => false
+ enable_application_owner confirmation: false
# Define access token scopes for your provider
# For more information go to
diff --git a/config/routes.rb b/config/routes.rb
index e122777314a..30df1ba0dfe 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,9 +3,9 @@ require 'api/api'
Gitlab::Application.routes.draw do
use_doorkeeper do
- controllers :applications => 'oauth/applications',
- :authorized_applications => 'oauth/authorized_applications',
- :authorizations => 'oauth/authorizations'
+ controllers applications: 'oauth/applications',
+ authorized_applications: 'oauth/authorized_applications',
+ authorizations: 'oauth/authorizations'
end
#
# Search