diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-07 15:43:28 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-04-07 15:43:28 +0000 |
| commit | 46aadc5c16150446840a26ea7199380830369326 (patch) | |
| tree | fd41b11d20b3c6589b01d4500ad234d3582b5379 /config | |
| parent | 2d246df57dd8e7da8c2743fba38d31992bc7a3fc (diff) | |
| parent | 6f15e89a6b83dcfef897dda414325b85090e2c40 (diff) | |
| download | gitlab-ce-46aadc5c16150446840a26ea7199380830369326.tar.gz | |
Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master'
Protected Tags
Closes #18471
See merge request !10356
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index e38f0537143..f5009186344 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -135,6 +135,8 @@ constraints(ProjectUrlConstrainer.new) do end resources :protected_branches, only: [:index, :show, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex } + resources :protected_tags, only: [:index, :show, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex } + resources :variables, only: [:index, :show, :update, :create, :destroy] resources :triggers, only: [:index, :create, :edit, :update, :destroy] do member do diff --git a/config/webpack.config.js b/config/webpack.config.js index dc431e4d566..987344f4eaa 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -41,6 +41,7 @@ var config = { pdf_viewer: './blob/pdf_viewer.js', profile: './profile/profile_bundle.js', protected_branches: './protected_branches/protected_branches_bundle.js', + protected_tags: './protected_tags', snippet: './snippet/snippet_bundle.js', stl_viewer: './blob/stl_viewer.js', terminal: './terminal/terminal_bundle.js', |