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

c5d65ed6

Commit c5d65ed6 authored 10 years ago by Dmitriy Zaporozhets

Downloads
- Plain Diff

Merge branch 'userpage-activity-scroll'

Conflicts:
	app/controllers/users_controller.rb

parents 81d603e2 fee1f2e0

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
app/assets/javascripts/dispatcher.js.coffee 1 addition, 0 deletions

app/assets/javascripts/dispatcher.js.coffee
app/controllers/users_controller.rb 19 additions, 6 deletions

app/controllers/users_controller.rb
app/views/users/show.html.haml 2 additions, 1 deletion

app/views/users/show.html.haml

with 23 additions and 7 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