Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-11

app/services/issues/move_service.rb

@@ -104,7 +104,7 @@ module Issues
         events = batch.map do |event|
           event.attributes
             .except('id', 'reference', 'reference_html')
-            .merge('issue_id' => @new_issue.id, 'created_at' => event.created_at)
+            .merge('issue_id' => @new_issue.id, 'action' => ResourceLabelEvent.actions[event.action])
         end
 
         Gitlab::Database.bulk_insert(ResourceLabelEvent.table_name, events)

changelogs/unreleased/rails5-fix-issue-move-service.yml

+---
+title: 'Rails 5: fix issue move service In rails 5, the attributes method for an enum
+  returns the name instead of the database integer.'
+merge_request: 21616
+author: Jasper Maes
+type: other

doc/development/contributing/design.md

@@ -25,10 +25,12 @@ There is a special type label called ~"product discovery". It represents a disco
 The initial issue should be about the problem we are solving. If a separate [product discovery issue](#product-discovery-issues) is needed for additional research and design work, it will be created by a PM or UX person. Assign the ~UX, ~"product discovery" and ~"Deliverable" labels, add a milestone and use a title that makes it clear that the scheduled issue is product discovery
 (e.g. `Product discovery for XYZ`).
 
-When the ~"product discovery" issue has been completed, the UXer removes the ~UX
-label, adds the ~"UX ready" label and closes the issue. This indicates the
-UX work for the issue is complete. The UXer will also copy any designs to related
-issues for implementation in an upcoming milestone.
+In order to complete a product discovery issue in a release, you must complete the following:
+
+1. UXer removes the ~UX label, adds the ~"UX ready" label.
+1. Modify the issue description in the product discovery issue to contain the final design. If it makes sense, the original information indicating the need for the design can be moved to a lower "Original Information" section.
+1. Copy the design to the description of the delivery issue for which the product discovery issue was created. Do not simply refer to the product discovery issue as a separate source of truth.
+1. In some cases, a product discovery issue also identifies future enhancements that will not go into the issue that originated the product discovery issue. For these items, create new issues containing the designs to ensure they are not lost. Put the issues in the backlog if they are agreed upon as good ideas. Otherwise leave them for triage.
 
 ## Style guides
 

qa/qa/git/repository.rb

@@ -28,8 +28,13 @@ module QA
       end
 
       def use_default_credentials
-        self.username = Runtime::User.username
-        self.password = Runtime::User.password
+        if ::QA::Runtime::User.ldap_user?
+          self.username = Runtime::User.ldap_username
+          self.password = Runtime::User.ldap_password
+        else
+          self.username = Runtime::User.username
+          self.password = Runtime::User.password
+        end
       end
 
       def clone(opts = '')

qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb

@@ -2,7 +2,7 @@
 
 module QA
   context :create do
-    describe 'Git clone over HTTP' do
+    describe 'Git clone over HTTP', :ldap do
       let(:location) do
         Page::Project::Show.act do
           choose_repository_clone_http

qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb

@@ -2,7 +2,7 @@
 
 module QA
   context :create do
-    describe 'Git push over HTTP' do
+    describe 'Git push over HTTP', :ldap do
       it 'user pushes code to the repository'  do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.act { sign_in_using_credentials }

qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb

@@ -2,7 +2,7 @@
 
 module QA
   context :create do
-    describe 'Protected branch support' do
+    describe 'Protected branch support', :ldap do
       let(:branch_name) { 'protected-branch' }
       let(:commit_message) { 'Protected push commit message' }
       let(:project) do