summaryrefslogtreecommitdiff
path: root/app/controllers/profiles_controller.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-06-05 13:57:01 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-13 17:58:16 -0400
commit0c0c31ff34b3010c2c269ec56ef48dd305c6f74a (patch)
treebc9bfe8512f3a7abc694f77bdd4824ed7d80b3de /app/controllers/profiles_controller.rb
parent44d68159999a0ee30f7714470c1ef5b0c4a717fa (diff)
downloadgitlab-ce-0c0c31ff34b3010c2c269ec56ef48dd305c6f74a.tar.gz
Move the "Design" templates and logic to Preferences
Diffstat (limited to 'app/controllers/profiles_controller.rb')
-rw-r--r--app/controllers/profiles_controller.rb22
1 files changed, 15 insertions, 7 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index f4366c18e7b..88e87996277 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -8,9 +8,6 @@ class ProfilesController < Profiles::ApplicationController
def show
end
- def design
- end
-
def applications
@applications = current_user.oauth_applications
@authorized_tokens = current_user.oauth_authorized_tokens
@@ -65,10 +62,21 @@ class ProfilesController < Profiles::ApplicationController
def user_params
params.require(:user).permit(
- :email, :password, :password_confirmation, :bio, :name,
- :username, :skype, :linkedin, :twitter, :website_url,
- :color_scheme_id, :theme_id, :avatar, :hide_no_ssh_key,
- :hide_no_password, :location, :public_email
+ :avatar,
+ :bio,
+ :email,
+ :hide_no_password,
+ :hide_no_ssh_key,
+ :linkedin,
+ :location,
+ :name,
+ :password,
+ :password_confirmation,
+ :public_email,
+ :skype,
+ :twitter,
+ :username,
+ :website_url
)
end
end