diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:21:19 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:21:19 +0100 |
| commit | 0520cd716435afa36204dd882f9cb7a23f81b11d (patch) | |
| tree | 39228fbaef420e8ef70c41e84322d0c5aea041e0 /app/views/projects/branches | |
| parent | 129ad8425e8fcbb1d7025e247d29772831d76b06 (diff) | |
| parent | 6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff) | |
| download | gitlab-ce-0520cd716435afa36204dd882f9cb7a23f81b11d.tar.gz | |
Merge branch 'master' into ui/form-consistency
Diffstat (limited to 'app/views/projects/branches')
| -rw-r--r-- | app/views/projects/branches/_commit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/branches/index.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/branches/_commit.html.haml b/app/views/projects/branches/_commit.html.haml index 22d77dda938..9fe65cbb104 100644 --- a/app/views/projects/branches/_commit.html.haml +++ b/app/views/projects/branches/_commit.html.haml @@ -1,5 +1,5 @@ .branch-commit - = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-id" + = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-id monospace" · %span.str-truncated = link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message" diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml index 03ade02a0c8..204def60794 100644 --- a/app/views/projects/branches/index.html.haml +++ b/app/views/projects/branches/index.html.haml @@ -5,7 +5,7 @@ .pull-right - if can? current_user, :push_code, @project = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do - %i.fa.fa-add-sign + = icon('plus') New branch .dropdown.inline |