Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config

2 files changed, 8 insertions, 0 deletions

diff --git a/config/routes/import.rb b/config/routes/import.rb
index 89f3b3f6378..c378253bf15 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -6,6 +6,12 @@ namespace :import do
     get :jobs
   end
 
+  resource :gitea, only: [:create, :new], controller: :gitea do
+    post :personal_access_token
+    get :status
+    get :jobs
+  end
+
   resource :gitlab, only: [:create], controller: :gitlab do
     get :status
     get :callback
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 1d0caac3080..d8e0243a80e 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -150,6 +150,8 @@ constraints(ProjectUrlConstrainer.new) do
       resources :environments, except: [:destroy] do
         member do
           post :stop
+          get :terminal
+          get '/terminal.ws/authorize', to: 'environments#terminal_websocket_authorize', constraints: { format: nil }
         end
       end