diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/production.rb | 1 | ||||
| -rw-r--r-- | config/initializers/grit_ext.rb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 10 |
3 files changed, 6 insertions, 7 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 7ebe4523967..d8094817c04 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -58,7 +58,6 @@ Gitlab::Application.configure do # Send deprecation notices to registered listeners config.active_support.deprecation = :notify - config.action_mailer.delivery_method = :sendmail # Defaults to: # # config.action_mailer.sendmail_settings = { diff --git a/config/initializers/grit_ext.rb b/config/initializers/grit_ext.rb index 9231da6ff9b..1a7e6361c01 100644 --- a/config/initializers/grit_ext.rb +++ b/config/initializers/grit_ext.rb @@ -7,6 +7,6 @@ Grit::Blob.class_eval do include Utils::Colorize end -Grit::Commit.class_eval do +Grit::Commit.class_eval do include CommitExt end diff --git a/config/routes.rb b/config/routes.rb index 8a40a8fef89..21a0729c33d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Gitlab::Application.routes.draw do - namespace :admin do + namespace :admin do resources :users resources :projects resources :team_members @@ -10,7 +10,7 @@ Gitlab::Application.routes.draw do root :to => "users#index" end - get "errors/gitosis" + get "errors/gitosis" get "profile/password", :to => "profile#password" put "profile/password", :to => "profile#password_update" put "profile/edit", :to => "profile#social_update" @@ -21,8 +21,8 @@ Gitlab::Application.routes.draw do resources :keys devise_for :users - resources :projects, :except => [:new, :create, :index], :path => "/" do - member do + resources :projects, :except => [:new, :create, :index], :path => "/" do + member do get "tree" get "blob" get "team" @@ -32,7 +32,7 @@ Gitlab::Application.routes.draw do get "tree/:commit_id" => "projects#tree" get "tree/:commit_id/:path" => "projects#tree", :as => :tree_file, - :constraints => { + :constraints => { :id => /[a-zA-Z0-9_\-]+/, :commit_id => /[a-zA-Z0-9]+/, :path => /.*/ |