Commit 7feec5fe authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'add-menu-icons' into 'master'

Add icons to Add dropdown items.

Before:

![Screen_Shot_2015-04-06_at_15.15.44](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a9f7d2e5dbd604fe7dff03cd7e47860e/Screen_Shot_2015-04-06_at_15.15.44.png)

After:

![Screen_Shot_2015-04-06_at_15.15.34](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c5be6cdbe32d1064da7497a1879a9eb3/Screen_Shot_2015-04-06_at_15.15.34.png)

See merge request !498
parents 18dfe0ce cf0e84cf
...@@ -64,6 +64,7 @@ v 7.10.0 (unreleased) ...@@ -64,6 +64,7 @@ v 7.10.0 (unreleased)
- Fix and improve help rendering (Sullivan Sénéchal) - Fix and improve help rendering (Sullivan Sénéchal)
- Fix final line in EmailsOnPush email diff being rendered as error. - Fix final line in EmailsOnPush email diff being rendered as error.
- Add icons to Add dropdown items.
v 7.9.2 v 7.9.2
- Contains no changes - Contains no changes
......
...@@ -6,28 +6,32 @@ ...@@ -6,28 +6,32 @@
- if @project.issues_enabled && can?(current_user, :write_issue, @project) - if @project.issues_enabled && can?(current_user, :write_issue, @project)
%li %li
= link_to url_for_new_issue(@project, only_path: true), title: "New Issue" do = link_to url_for_new_issue(@project, only_path: true), title: "New Issue" do
%i.fa.fa-fw.fa-exclamation-circle
New issue New issue
- if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project) - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
%li %li
= link_to new_namespace_project_merge_request_path(@project.namespace, @project), title: "New Merge Request" do = 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 New merge request
- if @project.snippets_enabled && can?(current_user, :write_snippet, @project) - if @project.snippets_enabled && can?(current_user, :write_snippet, @project)
%li %li
= link_to new_namespace_project_snippet_path(@project.namespace, @project), title: "New Snippet" do = link_to new_namespace_project_snippet_path(@project.namespace, @project), title: "New Snippet" do
%i.fa.fa-fw.fa-file-text-o
New snippet New snippet
- if can?(current_user, :admin_project_member, @project) - if can?(current_user, :admin_project_member, @project)
%li %li
= link_to namespace_project_project_members_path(@project.namespace, @project), title: "New project member" do = link_to namespace_project_project_members_path(@project.namespace, @project), title: "New project member" do
%i.fa.fa-fw.fa-users
New project member New project member
- if can? current_user, :push_code, @project - if can? current_user, :push_code, @project
%li.divider %li.divider
%li %li
= link_to new_namespace_project_branch_path(@project.namespace, @project) do = link_to new_namespace_project_branch_path(@project.namespace, @project) do
%i.fa.fa-code-fork %i.fa.fa-fw.fa-code-fork
Git branch New branch
%li %li
= link_to new_namespace_project_tag_path(@project.namespace, @project) do = link_to new_namespace_project_tag_path(@project.namespace, @project) do
%i.fa.fa-tag %i.fa.fa-fw.fa-tag
Git tag New tag
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment