Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab FOSS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

3d90560c

Unverified Commit 3d90560c authored 9 years ago by Dmitriy Zaporozhets

Downloads
- Plain Diff

Merge branch 'user-preferences-layout-option' of...

Merge branch 'user-preferences-layout-option' of https://github.com/gopeter/gitlabhq

into gopeter-user-preferences-layout-option

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

parents 3eef0e18 291e1fa9

No related branches found

No related tags found

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
app/controllers/profiles/preferences_controller.rb 1 addition, 0 deletions

app/controllers/profiles/preferences_controller.rb
app/helpers/page_layout_helper.rb 1 addition, 1 deletion

app/helpers/page_layout_helper.rb
app/helpers/preferences_helper.rb 7 additions, 0 deletions

app/helpers/preferences_helper.rb
app/models/user.rb 4 additions, 0 deletions

app/models/user.rb
app/views/profiles/preferences/show.html.haml 7 additions, 0 deletions

app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/update.js.erb 7 additions, 0 deletions

app/views/profiles/preferences/update.js.erb
db/migrate/20151005150751_add_layout_option_for_users.rb 5 additions, 0 deletions

db/migrate/20151005150751_add_layout_option_for_users.rb
db/schema.rb 2 additions, 1 deletion

db/schema.rb

with 35 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment