summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-06 15:12:26 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-06 15:13:50 +0200
commitcf0e84cf04162bf63b36ebc3b6034c3d44abe997 (patch)
treee2a432a40ee9a5889410ccc96b35d7c676d7ab14
parent45ca39e81bf857cdb58b1a184b8fab0e56c200f7 (diff)
downloadgitlab-ce-add-menu-icons.tar.gz
Add icons to Add dropdown items.add-menu-icons
-rw-r--r--CHANGELOG2
-rw-r--r--app/views/projects/_dropdown.html.haml12
2 files changed, 9 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index db3e5744b0e..6b3d32d261f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -62,7 +62,7 @@ v 7.10.0 (unreleased)
- Project labels are now available over the API under the "tag_list" field (Cristian Medina)
- Fixed link paths for HTTP and SSH on the admin project view (Jeremy Maziarz)
- Fix and improve help rendering (Sullivan Sénéchal)
-
+ - Add icons to Add dropdown items.
v 7.9.2
- Contains no changes
diff --git a/app/views/projects/_dropdown.html.haml b/app/views/projects/_dropdown.html.haml
index 3adb3087289..3036f11bb2d 100644
--- a/app/views/projects/_dropdown.html.haml
+++ b/app/views/projects/_dropdown.html.haml
@@ -6,28 +6,32 @@
- if @project.issues_enabled && can?(current_user, :write_issue, @project)
%li
= link_to url_for_new_issue(@project, only_path: true), title: "New Issue" do
+ %i.fa.fa-fw.fa-exclamation-circle
New issue
- if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
%li
= link_to new_namespace_project_merge_request_path(@project.namespace, @project), title: "New Merge Request" do
+ %i.fa.fa-fw.fa-tasks
New merge request
- if @project.snippets_enabled && can?(current_user, :write_snippet, @project)
%li
= link_to new_namespace_project_snippet_path(@project.namespace, @project), title: "New Snippet" do
+ %i.fa.fa-fw.fa-file-text-o
New snippet
- if can?(current_user, :admin_project_member, @project)
%li
= link_to namespace_project_project_members_path(@project.namespace, @project), title: "New project member" do
+ %i.fa.fa-fw.fa-users
New project member
- if can? current_user, :push_code, @project
%li.divider
%li
= link_to new_namespace_project_branch_path(@project.namespace, @project) do
- %i.fa.fa-code-fork
- Git branch
+ %i.fa.fa-fw.fa-code-fork
+ New branch
%li
= link_to new_namespace_project_tag_path(@project.namespace, @project) do
- %i.fa.fa-tag
- Git tag
+ %i.fa.fa-fw.fa-tag
+ New tag