Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
7f702b33
Commit
7f702b33
authored
Jun 10, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add `dashboard` attribute to User model
cherry-picked
parent
122e83c3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
5 deletions
+25
-5
app/controllers/profiles/preferences_controller.rb
app/controllers/profiles/preferences_controller.rb
+1
-0
app/models/user.rb
app/models/user.rb
+6
-1
db/migrate/20150610065936_add_dashboard_to_users.rb
db/migrate/20150610065936_add_dashboard_to_users.rb
+9
-0
db/schema.rb
db/schema.rb
+5
-3
spec/controllers/profiles/preferences_controller_spec.rb
spec/controllers/profiles/preferences_controller_spec.rb
+2
-0
spec/models/user_spec.rb
spec/models/user_spec.rb
+2
-1
No files found.
app/controllers/profiles/preferences_controller.rb
View file @
7f702b33
...
@@ -26,6 +26,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController
...
@@ -26,6 +26,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController
def
preferences_params
def
preferences_params
params
.
require
(
:user
).
permit
(
params
.
require
(
:user
).
permit
(
:color_scheme_id
,
:color_scheme_id
,
:dashboard
,
:theme_id
:theme_id
)
)
end
end
...
...
app/models/user.rb
View file @
7f702b33
...
@@ -50,12 +50,13 @@
...
@@ -50,12 +50,13 @@
# bitbucket_access_token :string(255)
# bitbucket_access_token :string(255)
# bitbucket_access_token_secret :string(255)
# bitbucket_access_token_secret :string(255)
# location :string(255)
# location :string(255)
# public_email :string(255) default(""), not null
# encrypted_otp_secret :string(255)
# encrypted_otp_secret :string(255)
# encrypted_otp_secret_iv :string(255)
# encrypted_otp_secret_iv :string(255)
# encrypted_otp_secret_salt :string(255)
# encrypted_otp_secret_salt :string(255)
# otp_required_for_login :boolean
# otp_required_for_login :boolean
# otp_backup_codes :text
# otp_backup_codes :text
#
public_email :string(255) default(""), not null
#
dashboard :integer default(0)
#
#
require
'carrierwave/orm/activerecord'
require
'carrierwave/orm/activerecord'
...
@@ -701,4 +702,8 @@ class User < ActiveRecord::Base
...
@@ -701,4 +702,8 @@ class User < ActiveRecord::Base
def
can_be_removed?
def
can_be_removed?
!
solo_owned_groups
.
present?
!
solo_owned_groups
.
present?
end
end
# User's Dashboard preference
# Note: When adding an option, it MUST go on the end of the array.
enum
dashboard:
[
:projects
,
:stars
]
end
end
db/migrate/20150610065936_add_dashboard_to_users.rb
0 → 100644
View file @
7f702b33
class
AddDashboardToUsers
<
ActiveRecord
::
Migration
def
up
add_column
:users
,
:dashboard
,
:integer
,
default:
0
end
def
down
remove_column
:users
,
:dashboard
end
end
db/schema.rb
View file @
7f702b33
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended that you check this file into your version control system.
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
20150
529150354
)
do
ActiveRecord
::
Schema
.
define
(
version:
20150
610065936
)
do
# These are extensions that must be enabled in order to support this database
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
enable_extension
"plpgsql"
...
@@ -29,12 +29,13 @@ ActiveRecord::Schema.define(version: 20150529150354) do
...
@@ -29,12 +29,13 @@ ActiveRecord::Schema.define(version: 20150529150354) do
t
.
boolean
"twitter_sharing_enabled"
,
default:
true
t
.
boolean
"twitter_sharing_enabled"
,
default:
true
t
.
text
"restricted_visibility_levels"
t
.
text
"restricted_visibility_levels"
t
.
boolean
"version_check_enabled"
,
default:
true
t
.
boolean
"version_check_enabled"
,
default:
true
t
.
integer
"max_attachment_size"
,
default:
10
,
null:
false
t
.
integer
"max_attachment_size"
,
default:
10
,
null:
false
t
.
integer
"default_project_visibility"
t
.
integer
"default_project_visibility"
t
.
integer
"default_snippet_visibility"
t
.
integer
"default_snippet_visibility"
t
.
text
"restricted_signup_domains"
t
.
text
"restricted_signup_domains"
t
.
boolean
"user_oauth_applications"
,
default:
true
t
.
boolean
"user_oauth_applications"
,
default:
true
t
.
string
"after_sign_out_path"
t
.
string
"after_sign_out_path"
t
.
integer
"session_expire_delay"
,
default:
10080
,
null:
false
end
end
create_table
"broadcast_messages"
,
force:
true
do
|
t
|
create_table
"broadcast_messages"
,
force:
true
do
|
t
|
...
@@ -495,12 +496,13 @@ ActiveRecord::Schema.define(version: 20150529150354) do
...
@@ -495,12 +496,13 @@ ActiveRecord::Schema.define(version: 20150529150354) do
t
.
string
"bitbucket_access_token"
t
.
string
"bitbucket_access_token"
t
.
string
"bitbucket_access_token_secret"
t
.
string
"bitbucket_access_token_secret"
t
.
string
"location"
t
.
string
"location"
t
.
string
"public_email"
,
default:
""
,
null:
false
t
.
string
"encrypted_otp_secret"
t
.
string
"encrypted_otp_secret"
t
.
string
"encrypted_otp_secret_iv"
t
.
string
"encrypted_otp_secret_iv"
t
.
string
"encrypted_otp_secret_salt"
t
.
string
"encrypted_otp_secret_salt"
t
.
boolean
"otp_required_for_login"
t
.
boolean
"otp_required_for_login"
t
.
text
"otp_backup_codes"
t
.
text
"otp_backup_codes"
t
.
string
"public_email"
,
default:
""
,
null:
false
t
.
integer
"dashboard"
,
default:
0
end
end
add_index
"users"
,
[
"admin"
],
name:
"index_users_on_admin"
,
using: :btree
add_index
"users"
,
[
"admin"
],
name:
"index_users_on_admin"
,
using: :btree
...
...
spec/controllers/profiles/preferences_controller_spec.rb
View file @
7f702b33
...
@@ -25,6 +25,7 @@ describe Profiles::PreferencesController do
...
@@ -25,6 +25,7 @@ describe Profiles::PreferencesController do
def
go
(
params:
{},
format: :js
)
def
go
(
params:
{},
format: :js
)
params
.
reverse_merge!
(
params
.
reverse_merge!
(
color_scheme_id:
'1'
,
color_scheme_id:
'1'
,
dashboard:
'stars'
,
theme_id:
'1'
theme_id:
'1'
)
)
...
@@ -40,6 +41,7 @@ describe Profiles::PreferencesController do
...
@@ -40,6 +41,7 @@ describe Profiles::PreferencesController do
it
"changes the user's preferences"
do
it
"changes the user's preferences"
do
prefs
=
{
prefs
=
{
color_scheme_id:
'1'
,
color_scheme_id:
'1'
,
dashboard:
'stars'
,
theme_id:
'2'
theme_id:
'2'
}.
with_indifferent_access
}.
with_indifferent_access
...
...
spec/models/user_spec.rb
View file @
7f702b33
...
@@ -50,12 +50,13 @@
...
@@ -50,12 +50,13 @@
# bitbucket_access_token :string(255)
# bitbucket_access_token :string(255)
# bitbucket_access_token_secret :string(255)
# bitbucket_access_token_secret :string(255)
# location :string(255)
# location :string(255)
# public_email :string(255) default(""), not null
# encrypted_otp_secret :string(255)
# encrypted_otp_secret :string(255)
# encrypted_otp_secret_iv :string(255)
# encrypted_otp_secret_iv :string(255)
# encrypted_otp_secret_salt :string(255)
# encrypted_otp_secret_salt :string(255)
# otp_required_for_login :boolean
# otp_required_for_login :boolean
# otp_backup_codes :text
# otp_backup_codes :text
#
public_email :string(255) default(""), not null
#
dashboard :integer default(0)
#
#
require
'spec_helper'
require
'spec_helper'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment