Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- 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

d54f8098

Commit d54f8098 authored 10 years ago by Dmitriy Zaporozhets

Downloads
- Plain Diff

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

parents b5b9b67e 152a6b86

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/users_controller.rb 22 additions, 11 deletions

app/controllers/users_controller.rb
app/views/users/calendar.html.haml 1 addition, 0 deletions

app/views/users/calendar.html.haml
app/views/users/show.html.haml 8 additions, 2 deletions

app/views/users/show.html.haml
config/routes.rb 3 additions, 4 deletions

config/routes.rb
spec/controllers/users_controller_spec.rb 5 additions, 5 deletions

spec/controllers/users_controller_spec.rb

with 39 additions and 22 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