diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 5 | ||||
| -rw-r--r-- | config/dependency_decisions.yml | 6 | ||||
| -rw-r--r-- | config/initializers/rbtrace.rb | 3 | ||||
| -rw-r--r-- | config/routes/admin.rb | 2 | ||||
| -rw-r--r-- | config/routes/project.rb | 2 | ||||
| -rw-r--r-- | config/routes/repository.rb | 1 |
6 files changed, 16 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 0304f466734..b9d4f6765e3 100644 --- a/config/application.rb +++ b/config/application.rb @@ -43,10 +43,12 @@ module Gitlab #{config.root}/app/models/members #{config.root}/app/models/project_services #{config.root}/app/workers/concerns + #{config.root}/app/policies/concerns #{config.root}/app/services/concerns #{config.root}/app/serializers/concerns #{config.root}/app/finders/concerns - #{config.root}/app/graphql/resolvers/concerns]) + #{config.root}/app/graphql/resolvers/concerns + #{config.root}/app/graphql/mutations/concerns]) config.generators.templates.push("#{config.root}/generator_templates") @@ -132,6 +134,7 @@ module Gitlab config.assets.precompile << "notify.css" config.assets.precompile << "mailers/*.css" config.assets.precompile << "xterm/xterm.css" + config.assets.precompile << "page_bundles/ide.css" config.assets.precompile << "performance_bar.css" config.assets.precompile << "lib/ace.js" config.assets.precompile << "test.css" diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index 21c20cd5e93..73115449871 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -540,3 +540,9 @@ :why: https://github.com/xtuc/webassemblyjs/blob/master/LICENSE :versions: [] :when: 2018-06-08 05:30:56.764116000 Z +- - :approve + - "@gitlab-org/gitlab-ui" + - :who: Clement Ho + :why: Our own library + :versions: [] + :when: 2018-07-17 21:02:54.529227000 Z diff --git a/config/initializers/rbtrace.rb b/config/initializers/rbtrace.rb new file mode 100644 index 00000000000..3a076c99ad0 --- /dev/null +++ b/config/initializers/rbtrace.rb @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +require 'rbtrace' if ENV['ENABLE_RBTRACE'] diff --git a/config/routes/admin.rb b/config/routes/admin.rb index ff27ceb50dc..109f00631fb 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -54,7 +54,7 @@ namespace :admin do resources :hooks, only: [:index, :create, :edit, :update, :destroy] do member do - get :test + post :test end resources :hook_logs, only: [:show] do diff --git a/config/routes/project.rb b/config/routes/project.rb index 5057e937941..8e019f8c8bb 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -301,7 +301,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :hooks, only: [:index, :create, :edit, :update, :destroy], constraints: { id: /\d+/ } do member do - get :test + post :test end resources :hook_logs, only: [:show] do diff --git a/config/routes/repository.rb b/config/routes/repository.rb index e2bf8d6a7ff..d439cb9acbd 100644 --- a/config/routes/repository.rb +++ b/config/routes/repository.rb @@ -83,6 +83,7 @@ scope format: false do get '/raw/*id', to: 'raw#show', as: :raw get '/blame/*id', to: 'blame#show', as: :blame + get '/commits', to: 'commits#commits_root', as: :commits_root get '/commits/*id/signatures', to: 'commits#signatures', as: :signatures get '/commits/*id', to: 'commits#show', as: :commits |