diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-30 14:12:24 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-30 14:12:24 +0300 |
| commit | d19d094b935b6b1b773d369893d4f112e91b38a9 (patch) | |
| tree | 1ded12ce6bed836952d8f10a9e7cf30be6775838 /app | |
| parent | 0d715bcd812ca6c99884e117f28a400669aa8e57 (diff) | |
| download | gitlab-ce-d19d094b935b6b1b773d369893d4f112e91b38a9.tar.gz | |
Remove ugly button and truncate too long project names. Remove unecessary newlines
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/events/_event_last_push.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml index a634365ff3e..de5634d3c55 100644 --- a/app/views/events/_event_last_push.html.haml +++ b/app/views/events/_event_last_push.html.haml @@ -9,9 +9,6 @@ = time_ago_in_words(event.created_at) ago. .pull-right - = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-new-mr" do + = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do Create Merge Request - - if !event.project.nil? && event.project.forked? - = link_to new_mr_path_for_fork_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do - Create Merge Request on fork %hr diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index c36ac2ed55b..e7838733af3 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -2,10 +2,10 @@ = "Merge Request ##{@merge_request.id}:" -if @merge_request.for_fork? - %span.label-project= @merge_request.source_project.path_with_namespace + %span.label-project= truncate(@merge_request.source_project.path_with_namespace, length: 25) %span.label-branch= @merge_request.source_branch → - %span.label-project= @merge_request.target_project.path_with_namespace + %span.label-project= truncate(@merge_request.target_project.path_with_namespace, length: 25) %span.label-branch= @merge_request.target_branch - else %span.label-branch= @merge_request.source_branch |