diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-07-29 13:19:50 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-07-29 13:19:50 -0500 |
| commit | fe22704a203111ab2146143a4ff9d2e1256aecc7 (patch) | |
| tree | 1bafbd0bdfbd498220cef09c94eb71bf4f9e072f /config | |
| parent | f039d592aa6203502be487801777167e433ad9d2 (diff) | |
| parent | cc7b15fe935d41aab85918eb7ae7c0ef81f8bfb0 (diff) | |
| download | gitlab-ce-fe22704a203111ab2146143a4ff9d2e1256aecc7.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/octokit.rb | 1 | ||||
| -rw-r--r-- | config/routes/project.rb | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/config/initializers/octokit.rb b/config/initializers/octokit.rb new file mode 100644 index 00000000000..b3749258ec5 --- /dev/null +++ b/config/initializers/octokit.rb @@ -0,0 +1 @@ +Octokit.middleware.insert_after Octokit::Middleware::FollowRedirects, Gitlab::Octokit::Middleware diff --git a/config/routes/project.rb b/config/routes/project.rb index c202463dadb..1f632765317 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -339,11 +339,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resource :variables, only: [:show, :update] - resources :triggers, only: [:index, :create, :edit, :update, :destroy] do - member do - post :take_ownership - end - end + resources :triggers, only: [:index, :create, :edit, :update, :destroy] resource :mirror, only: [:show, :update] do member do |