summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAishwarya Subramanian <asubramanian@gitlab.com>2019-08-27 03:46:03 +0530
committerAishwarya Subramanian <asubramanian@gitlab.com>2019-08-27 03:46:03 +0530
commit1a90baa13ae875677adccebb45c6834805dd9af9 (patch)
tree13805fb06cdaa4ebea43b780d7ef8fb541d680ce
parentab560c72b85c521054146ea606aacf6e420694ea (diff)
downloadgitlab-ce-1a90baa13ae875677adccebb45c6834805dd9af9.tar.gz
Modified route to nest under -
-rw-r--r--app/controllers/registrations_controller.rb2
-rw-r--r--config/routes.rb5
2 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 3701abe9d32..e773ec09924 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -115,7 +115,7 @@ class RegistrationsController < Devise::RegistrationsController
end
def resource
- @resource ||= Users::BuildService.new(current_user, sign_up_params).execute(skip_authorization: true)
+ @resource ||= Users::BuildService.new(current_user, sign_up_params).execute
end
def devise_mapping
diff --git a/config/routes.rb b/config/routes.rb
index 3cdb0328604..c333550f758 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -110,6 +110,7 @@ Rails.application.routes.draw do
draw :smartcard
draw :jira_connect
draw :username
+ draw :trial_registration
end
Gitlab.ee do
@@ -188,10 +189,6 @@ Rails.application.routes.draw do
draw :user
draw :project
- Gitlab.ee do
- draw :trial_registration
- end
-
root to: "root#index"
get '*unmatched_route', to: 'application#route_not_found'