diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-12 22:15:34 +0400 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-12 22:15:34 +0400 |
| commit | b96af79bb8a312e6870ad62637c0e3372eac32b7 (patch) | |
| tree | 7904408d45f6e99b84439a89c271c2516095d3e5 /app | |
| parent | e0d1fba15e86771e7ecf820d1bec68aa5c0e9cb1 (diff) | |
Specs for last push widget
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/common.scss | 1 | ||||
| -rw-r--r-- | app/views/events/_event_last_push.html.haml | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index f7c24191c4f..7a94c127bb4 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -745,4 +745,5 @@ li.note { border-style: solid; border-width: 1px; @include border-radius(4px); + min-height:42px; } diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml index 95ae01bd49e..8c6918d2548 100644 --- a/app/views/events/_event_last_push.html.haml +++ b/app/views/events/_event_last_push.html.haml @@ -1,4 +1,4 @@ -- if event && event.branch_name && event.project.merge_requests_enabled +- if event && event.branch_name .event_lp %div = image_tag gravatar_icon(event.author_email), :class => "avatar" @@ -12,5 +12,6 @@ = time_ago_in_words(event.created_at) ago. - = link_to new_mr_path_from_push_event(event), :title => "New Merge Request", :class => "btn small padded primary" do - Merge Request + - if event.project.merge_requests_enabled + = link_to new_mr_path_from_push_event(event), :title => "New Merge Request", :class => "btn small padded primary" do + Create Merge Request |