Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-17

# Conflicts:
#	app/controllers/projects/deploy_keys_controller.rb

[ci skip]

app/controllers/projects/deploy_keys_controller.rb

@@ -24,9 +24,13 @@ class Projects::DeployKeysController < Projects::ApplicationController
   def create
     @key = DeployKeys::CreateService.new(current_user, create_params).execute
 
+<<<<<<< HEAD
     if @key.valid?
       log_audit_event(@key.title, action: :create)
     else
+=======
+    unless @key.valid?
+>>>>>>> upstream/master
       flash[:alert] = @key.errors.full_messages.join(', ').html_safe
     end
 

app/views/projects/buttons/_dropdown.html.haml

@@ -9,34 +9,27 @@
       - can_create_snippet = can?(current_user, :create_snippet, @project)
 
       - if can_create_issue
-        %li
-          = link_to _('New issue'), new_project_issue_path(@project)
+        %li= link_to _('New issue'), new_project_issue_path(@project)
+
       - if merge_project
-        %li
-          = link_to _('New merge request'), project_new_merge_request_path(merge_project)
+        %li= link_to _('New merge request'), project_new_merge_request_path(merge_project)
+
       - if can_create_snippet
-        %li
-          = link_to _('New snippet'), new_project_snippet_path(@project)
+        %li= link_to _('New snippet'), new_project_snippet_path(@project)
 
       - if can_create_issue || merge_project || can_create_snippet
         %li.divider
 
       - if can?(current_user, :push_code, @project)
-        %li
-          = link_to _('New file'), project_new_blob_path(@project, @project.default_branch || 'master')
+        %li= link_to _('New file'), project_new_blob_path(@project, @project.default_branch || 'master')
         - unless @project.empty_repo?
-          %li
-            = link_to _('New branch'), new_project_branch_path(@project)
-          %li
-            = link_to _('New tag'), new_project_tag_path(@project)
+          %li= link_to _('New branch'), new_project_branch_path(@project)
+          %li= link_to _('New tag'), new_project_tag_path(@project)
       - elsif current_user && current_user.already_forked?(@project)
-        %li
-          = link_to _('New file'), project_new_blob_path(@project, @project.default_branch || 'master')
+        %li= link_to _('New file'), project_new_blob_path(@project, @project.default_branch || 'master')
       - elsif can?(current_user, :fork_project, @project)
-        %li
-          - continue_params = { to:         project_new_blob_path(@project, @project.default_branch || 'master'),
-                                notice:     edit_in_new_fork_notice,
-                                notice_now: edit_in_new_fork_notice_now }
-          - fork_path = project_forks_path(@project, namespace_key:  current_user.namespace.id,
-                                                                                  continue:       continue_params)
-          = link_to _('New file'), fork_path, method: :post
+        - continue_params = { to:         project_new_blob_path(@project, @project.default_branch || 'master'),
+                              notice:     edit_in_new_fork_notice,
+                              notice_now: edit_in_new_fork_notice_now }
+        - fork_path = project_forks_path(@project, namespace_key:  current_user.namespace.id, continue: continue_params)
+        %li= link_to _('New file'), fork_path, method: :post

yarn.lock

@@ -6167,6 +6167,12 @@ supports-color@^5.1.0:
   dependencies:
     has-flag "^2.0.0"
 
+supports-color@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
+  dependencies:
+    has-flag "^2.0.0"
+
 svg4everybody@2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/svg4everybody/-/svg4everybody-2.1.9.tgz#5bd9f6defc133859a044646d4743fabc28db7e2d"