diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-17 21:31:41 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-17 21:31:41 +0300 |
| commit | 8bff9a4098c80e0b44bf7f07a2b471c6ad54d213 (patch) | |
| tree | 835c85d8c95a99249b84bcc7e86550da13c66aaf /config | |
| parent | 6dff16a6799cc34cd2cf70cebce70bbffc70c3f5 (diff) | |
| parent | 07bc48c526bc48e0ee5590f4232484d9ee8f8c35 (diff) | |
| download | gitlab-ce-8bff9a4098c80e0b44bf7f07a2b471c6ad54d213.tar.gz | |
Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 7 | ||||
| -rw-r--r-- | config/routes.rb | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 68dce05fc59..99dfafdb786 100644 --- a/config/application.rb +++ b/config/application.rb @@ -12,7 +12,12 @@ module Gitlab # -- all .rb files in that directory are automatically loaded. # Custom directories with classes and modules you want to be autoloadable. - config.autoload_paths += %W(#{config.root}/lib #{config.root}/app/finders #{config.root}/app/models/concerns #{config.root}/app/models/project_services) + config.autoload_paths += %W(#{config.root}/lib + #{config.root}/app/finders + #{config.root}/app/models/hooks + #{config.root}/app/models/concerns + #{config.root}/app/models/project_services + #{config.root}/app/models/members) # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named. diff --git a/config/routes.rb b/config/routes.rb index ce66ea99951..39ab9f4265a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -161,9 +161,8 @@ Gitlab::Application.routes.draw do get :projects end - resources :users_groups, only: [:create, :update, :destroy] - scope module: :groups do + resources :group_members, only: [:create, :update, :destroy] resource :avatar, only: [:destroy] resources :milestones end |