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

0ddf1d9d

Verified Commit 0ddf1d9d authored 11 years ago by Dmitriy Zaporozhets

Downloads
- Plain Diff

Merge branch 'feature/edit_from_mr'


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

Conflicts:
	CHANGELOG

parents d68525ff 4e15cbf4

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
app/assets/stylesheets/sections/commits.scss 7 additions, 3 deletions

app/assets/stylesheets/sections/commits.scss
app/controllers/projects/edit_tree_controller.rb 10 additions, 1 deletion

app/controllers/projects/edit_tree_controller.rb
app/views/projects/commits/_diffs.html.haml 15 additions, 7 deletions

app/views/projects/commits/_diffs.html.haml
app/views/projects/edit_tree/show.html.haml 1 addition, 0 deletions

app/views/projects/edit_tree/show.html.haml

with 34 additions and 11 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