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

df55d35f

Commit df55d35f authored 8 years ago by Jacob Schatz

Downloads
- Plain Diff

Merge branch 'widget-widget-widget-fun' into 'master'

Merge request widget merged state styling

See merge request !9352

parents 9e4d7630 965d96bc

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/stylesheets/pages/merge_requests.scss 61 additions, 6 deletions

app/assets/stylesheets/pages/merge_requests.scss
app/views/projects/merge_requests/_show.html.haml 2 additions, 2 deletions

app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/widget/_heading.html.haml 1 addition, 1 deletion

app/views/projects/merge_requests/widget/_heading.html.haml
app/views/projects/merge_requests/widget/_merged.html.haml 39 additions, 21 deletions

app/views/projects/merge_requests/widget/_merged.html.haml
app/views/projects/merge_requests/widget/_merged_buttons.haml 1 addition, 1 deletion

...views/projects/merge_requests/widget/_merged_buttons.haml
app/views/projects/merge_requests/widget/open/_conflicts.html.haml 15 additions, 11 deletions

.../projects/merge_requests/widget/open/_conflicts.html.haml
app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml 14 additions, 9 deletions

...uests/widget/open/_merge_when_pipeline_succeeds.html.haml

with 133 additions and 51 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