summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-05-04 15:17:25 +0000
committerDouwe Maan <douwe@gitlab.com>2018-05-04 15:17:25 +0000
commit7603beffc916d06039cac63b223d8e6234b5d666 (patch)
treeb8b52e683a2c5829a97d7a802fae383369ab9eb5 /config
parenta1ce521c995cc7943583e6c42e13666e1edd93ac (diff)
parent39916fdfeddfd75279d13fa976fdb07f3b9b0e26 (diff)
downloadgitlab-ce-7603beffc916d06039cac63b223d8e6234b5d666.tar.gz
Merge branch 'bvl-enforce-terms' into 'master'
Enforce application wide terms Closes #44798 See merge request gitlab-org/gitlab-ce!18570
Diffstat (limited to 'config')
-rw-r--r--config/routes/user.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/config/routes/user.rb b/config/routes/user.rb
index f8677693fab..bc7df5e7584 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -27,6 +27,13 @@ devise_scope :user do
get '/users/almost_there' => 'confirmations#almost_there'
end
+scope '-/users', module: :users do
+ resources :terms, only: [:index] do
+ post :accept, on: :member
+ post :decline, on: :member
+ end
+end
+
scope(constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }) do
scope(path: 'users/:username',
as: :user,