Merge branch 'disabled-issues-mr-features' into 'master'

Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings

Closes #1676

See merge request !691

3 files changed, 28 insertions, 38 deletions

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 85a15596f8d..04d9dccf916 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -101,6 +101,22 @@ class Ability
           rules -= project_archived_rules
         end
 
+        unless project.issues_enabled
+          rules -= named_abilities('issue')
+        end
+
+        unless project.merge_requests_enabled
+          rules -= named_abilities('merge_request')
+        end
+
+        unless project.snippets_enabled
+          rules -= named_abilities('snippet')
+        end
+
+        unless project.wiki_enabled
+          rules -= named_abilities('wiki')
+        end
+
         rules
       end
     end
@@ -272,5 +288,16 @@ class Ability
                        abilities
                      end
     end
+
+    private
+
+    def named_abilities(name)
+      [
+        :"read_#{name}",
+        :"write_#{name}",
+        :"modify_#{name}",
+        :"admin_#{name}"
+      ]
+    end
   end
 end
diff --git a/app/views/projects/_dropdown.html.haml b/app/views/projects/_dropdown.html.haml
deleted file mode 100644
index d623a3716ed..00000000000
--- a/app/views/projects/_dropdown.html.haml
+++ /dev/null
@@ -1,37 +0,0 @@
-- if current_user
-  .dropdown.pull-right
-    %a.dropdown-toggle.btn.btn-sm{href: '#', "data-toggle" => "dropdown"}
-      %i.fa.fa-bars
-    %ul.dropdown-menu
-      - 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-fw.fa-code-fork
-            New branch
-        %li
-          = link_to new_namespace_project_tag_path(@project.namespace, @project) do
-            %i.fa.fa-fw.fa-tag
-            New tag
-
-
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index bba2b8764ac..22172a31289 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -61,7 +61,7 @@
       Participants
       %span.badge= @users.count
 
-  - if @project.issues_enabled
+  - if can?(current_user, :write_issue, @project)
     .pull-right
       = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { milestone_id: @milestone.id }), class: "btn  btn-grouped", title: "New Issue" do
         %i.fa.fa-plus