diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-02 14:20:11 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-02 14:52:13 +0100 |
| commit | 9517b6211782619ba4d4f9f1322230bd833c0a2c (patch) | |
| tree | 359c2412ec9e557e61c917141d3d69c87221e699 | |
| parent | fbe6432934973021acddcff1d3b0fd3ed5844d2b (diff) | |
| download | gitlab-ce-9517b6211782619ba4d4f9f1322230bd833c0a2c.tar.gz | |
Link MR list item branch name to branch
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 61689aff57e..1c7c31b02a9 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -337,10 +337,6 @@ table { text-align: center; } -.task-status { - margin-left: 10px; -} - #nprogress .spinner { top: 15px !important; right: 10px !important; diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 8246a432c77..60dd4f4f87c 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -44,8 +44,8 @@ = link_to_label(label, project: merge_request.project) - if merge_request.target_project.default_branch != merge_request.target_branch - %span - %i.fa.fa-code-fork + = link_to namespace_project_commits_path(merge_request.project.namespace, merge_request.project, merge_request.target_branch) do + = icon('code-fork') = merge_request.target_branch - if merge_request.tasks? |