summaryrefslogtreecommitdiff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-13 06:06:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-13 06:06:38 +0000
commit213ce7805856f2cc1d019a03c76ae0d098337c26 (patch)
treee97e9e02515dd83a2a5decd66ae8553ebb93b350 /config/routes.rb
parentd41c040fa25a8b4092843b84bf7d839591b6ee09 (diff)
downloadgitlab-ce-213ce7805856f2cc1d019a03c76ae0d098337c26.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 23e97fe32dd..9fb4d94f068 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -142,7 +142,13 @@ Rails.application.routes.draw do
collection do
post :create_user
post :create_gcp
+ post :create_aws
post :authorize_aws_role
+ delete :revoke_aws_role
+
+ scope :aws do
+ get 'api/:resource', to: 'clusters#aws_proxy', as: :aws_proxy
+ end
end
member do