summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-03-08 00:39:27 +0000
committerDouwe Maan <douwe@gitlab.com>2018-03-08 00:39:27 +0000
commit7734e85bc6592c5ad3330c611c5f83a051b680b0 (patch)
tree10af9444dee64a8720ac4674e5e215ebcc5d7beb /config
parentf8e06b50eea2aecaf1f37fb7228292e8516e2613 (diff)
parent93af1af67fc6af2805f3342aed1fc15a4360870d (diff)
downloadgitlab-ce-7734e85bc6592c5ad3330c611c5f83a051b680b0.tar.gz
Merge branch 'ce-jej/github-project-service-for-ci' into 'master'
Backport changes from introducing GithubService interation in EE See merge request gitlab-org/gitlab-ce!17607
Diffstat (limited to 'config')
-rw-r--r--config/routes/project.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb
index cb46c439415..710fe0ec325 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -69,7 +69,7 @@ constraints(ProjectUrlConstrainer.new) do
end
end
- resources :services, constraints: { id: %r{[^/]+} }, only: [:index, :edit, :update] do
+ resources :services, constraints: { id: %r{[^/]+} }, only: [:edit, :update] do
member do
put :test
end