Merge branch 'ce-to-ee-2018-11-14' into 'master'

CE upstream - 2018-11-14 13:21 UTC

Closes charts/gitlab#897

See merge request gitlab-org/gitlab-ee!8447

.gitlab-ci.yml

@@ -428,7 +428,7 @@ cloud-native-image:
   image: ruby:2.5-alpine
   before_script: []
   dependencies: []
-  stage: test
+  stage: post-test
   allow_failure: true
   variables:
     GIT_DEPTH: "1"

GITLAB_WORKHORSE_VERSION

-7.1.0
+7.1.1

Gemfile

@@ -327,7 +327,7 @@ group :development do
 
   # Better errors handler
   gem 'better_errors', '~> 2.1.0'
-  gem 'binding_of_caller', '~> 0.7.2'
+  gem 'binding_of_caller', '~> 0.8.0'
 
   # thin instead webrick
   gem 'thin', '~> 1.7.0'

Gemfile.lock

@@ -87,7 +87,7 @@ GEM
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
     bindata (2.4.3)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.3.2)
       msgpack (~> 1.0)
@@ -145,7 +145,7 @@ GEM
       addressable
     daemons (1.2.6)
     database_cleaner (1.5.3)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
     debugger-ruby_core_source (1.3.8)
     deckar01-task_list (2.0.0)
       html-pipeline
@@ -973,7 +973,7 @@ DEPENDENCIES
   bcrypt_pbkdf (~> 1.0)
   benchmark-ips (~> 2.3.0)
   better_errors (~> 2.1.0)
-  binding_of_caller (~> 0.7.2)
+  binding_of_caller (~> 0.8.0)
   bootsnap (~> 1.3)
   bootstrap_form (~> 2.7.0)
   brakeman (~> 4.2)

Gemfile.rails5.lock

@@ -90,7 +90,7 @@ GEM
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
     bindata (2.4.3)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.3.2)
       msgpack (~> 1.0)
@@ -148,7 +148,7 @@ GEM
       addressable
     daemons (1.2.6)
     database_cleaner (1.5.3)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
     debugger-ruby_core_source (1.3.8)
     deckar01-task_list (2.0.0)
       html-pipeline
@@ -982,7 +982,7 @@ DEPENDENCIES
   bcrypt_pbkdf (~> 1.0)
   benchmark-ips (~> 2.3.0)
   better_errors (~> 2.1.0)
-  binding_of_caller (~> 0.7.2)
+  binding_of_caller (~> 0.8.0)
   bootsnap (~> 1.3)
   bootstrap_form (~> 2.7.0)
   brakeman (~> 4.2)

app/views/events/event/_push.html.haml

@@ -7,10 +7,10 @@
 .event-title.d-flex.flex-wrap
   = inline_event_icon(event)
   %span.event-type.d-inline-block.append-right-4.pushed #{event.action_name} #{event.ref_type}
-  %span
+  %span.append-right-4
     - commits_link = project_commits_path(project, event.ref_name)
     - should_link = event.tag? ? project.repository.tag_exists?(event.ref_name) : project.repository.branch_exists?(event.ref_name)
-    = link_to_if should_link, event.ref_name, commits_link, class: 'ref-name append-right-4'
+    = link_to_if should_link, event.ref_name, commits_link, class: 'ref-name'
 
   = render "events/event_scope", event: event
 

app/views/shared/_label.html.haml

@@ -23,28 +23,29 @@
       %li.inline
         = link_to edit_label_path(label), class: 'btn btn-transparent label-action edit has-tooltip', title: _('Edit'), data: { placement: 'bottom' }, aria_label: _('Edit') do
           = sprite_icon('pencil')
-    %li.inline
-      .dropdown
-        %button{ type: 'button', class: 'btn btn-transparent js-label-options-dropdown label-action', data: { toggle: 'dropdown' }, aria_label: _('Label actions dropdown') }
-          = sprite_icon('ellipsis_v')
-        .dropdown-menu.dropdown-open-left
-          %ul
-            - if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group)
-              %li
-                %button.js-promote-project-label-button.btn.btn-transparent.btn-action{ disabled: true, type: 'button',
-                  data: { url: promote_project_label_path(label.project, label),
-                          label_title: label.title,
-                          label_color: label.color,
-                          label_text_color: label.text_color,
-                          group_name: label.project.group.name,
-                          target: '#promote-label-modal',
-                          container: 'body',
-                          toggle: 'modal' } }
-                  = _('Promote to group label')
-            - if can?(current_user, :admin_label, label)
-              %li
-                %span{ data: { toggle: 'modal', target: "#modal-delete-label-#{label.id}" } }
-                  %button.text-danger.remove-row{ type: 'button' }= _('Delete')
+    - if can?(current_user, :admin_label, label)
+      %li.inline
+        .dropdown
+          %button{ type: 'button', class: 'btn btn-transparent js-label-options-dropdown label-action', data: { toggle: 'dropdown' }, aria_label: _('Label actions dropdown') }
+            = sprite_icon('ellipsis_v')
+          .dropdown-menu.dropdown-open-left
+            %ul
+              - if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group)
+                %li
+                  %button.js-promote-project-label-button.btn.btn-transparent.btn-action{ disabled: true, type: 'button',
+                    data: { url: promote_project_label_path(label.project, label),
+                            label_title: label.title,
+                            label_color: label.color,
+                            label_text_color: label.text_color,
+                            group_name: label.project.group.name,
+                            target: '#promote-label-modal',
+                            container: 'body',
+                            toggle: 'modal' } }
+                    = _('Promote to group label')
+              - if can?(current_user, :admin_label, label)
+                %li
+                  %span{ data: { toggle: 'modal', target: "#modal-delete-label-#{label.id}" } }
+                    %button.text-danger.remove-row{ type: 'button' }= _('Delete')
     - if current_user
       %li.inline.label-subscription
         - if can_subscribe_to_label_in_different_levels?(label)

changelogs/unreleased/53816-empty-label-menu-if-not-logged-in.yml

+---
+title: Removes promote to group label for anonymous user
+merge_request: 23042
+author: Jacopo Beschi @jacopo-beschi
+type: fixed

changelogs/unreleased/54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted.yml

+---
+title: Adds margin after a deleted branch name in the activity feed.
+merge_request: 23038
+author:
+type: fixed