Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 0 deletions

diff --git a/config/routes/pipelines.rb b/config/routes/pipelines.rb
index 9b236a8ce17..cc3c3400526 100644
--- a/config/routes/pipelines.rb
+++ b/config/routes/pipelines.rb
@@ -15,6 +15,7 @@ resources :pipelines, only: [:index, :new, :create, :show, :destroy] do
     post :cancel
     post :retry
     get :builds
+    get :dag
     get :failures
     get :status
     get :test_report
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 864750d228f..ac8f621b2b6 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -90,6 +90,12 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             post :create_deploy_token, path: 'deploy_token/create'
             post :cleanup
           end
+
+          resources :access_tokens, only: [:index, :create] do
+            member do
+              put :revoke
+            end
+          end
         end
 
         resources :autocomplete_sources, only: [] do