diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-18 11:56:48 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-18 11:56:48 +0200 |
| commit | 66ff67b063f2c8d06f40625595c4208c33ffd1f1 (patch) | |
| tree | 5a680f44a1c028aa323c8d7541726e7d5881aeb2 /config | |
| parent | 829a708a970b31afdcda21fff072eda0c61dfd4c (diff) | |
| parent | 4e6af0c3fa335d138343dce3e0216303a9b1cd79 (diff) | |
| download | gitlab-ce-66ff67b063f2c8d06f40625595c4208c33ffd1f1.tar.gz | |
Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/initializers/metrics.rb | 1 | ||||
| -rw-r--r-- | config/routes/project.rb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 962ffe0708d..8a9c539cb43 100644 --- a/config/application.rb +++ b/config/application.rb @@ -89,6 +89,7 @@ module Gitlab config.assets.precompile << "profile/profile_bundle.js" config.assets.precompile << "diff_notes/diff_notes_bundle.js" config.assets.precompile << "boards/boards_bundle.js" + config.assets.precompile << "merge_conflicts/merge_conflicts_bundle.js" config.assets.precompile << "boards/test_utils/simulate_drag.js" config.assets.precompile << "blob_edit/blob_edit_bundle.js" config.assets.precompile << "snippet/snippet_bundle.js" diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index be22085b0df..3b8771543e4 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -67,6 +67,7 @@ if Gitlab::Metrics.enabled? ['app', 'finders'] => ['app', 'finders'], ['app', 'mailers', 'emails'] => ['app', 'mailers'], ['app', 'services', '**'] => ['app', 'services'], + ['lib', 'gitlab', 'conflicts'] => ['lib'], ['lib', 'gitlab', 'diff'] => ['lib'], ['lib', 'gitlab', 'email', 'message'] => ['lib'], ['lib', 'gitlab', 'checks'] => ['lib'] diff --git a/config/routes/project.rb b/config/routes/project.rb index 5e01d9a9e8f..8142e231621 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -267,6 +267,7 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: get :commits get :diffs get :conflicts + get :conflict_for_path get :builds get :pipelines get :merge_check |