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

# Conflicts:
#	.gitlab-ci.yml
#	app/controllers/omniauth_callbacks_controller.rb

[ci skip]

.gitlab-ci.yml

@@ -434,6 +434,10 @@ cloud-native-image:
   stage: build
   image: ruby:2.4-alpine
   before_script: []
+<<<<<<< HEAD
+=======
+  stage: test
+>>>>>>> upstream/master
   allow_failure: true
   cache: {}
   variables:

app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue

@@ -259,7 +259,7 @@ export default {
             data-toggle="dropdown"
             aria-label="Select merge moment">
             <i
-              class="fa fa-chevron-down"
+              class="fa fa-chevron-down qa-merge-moment-dropdown"
               aria-hidden="true"
             ></i>
           </button>
@@ -269,7 +269,7 @@ export default {
             role="menu">
             <li>
               <a
-                class="merge_when_pipeline_succeeds"
+                class="merge_when_pipeline_succeeds qa-merge-when-pipeline-succeeds-option"
                 href="#"
                 @click.prevent="handleMergeButtonClick(true)">
                 <span class="media">
@@ -283,7 +283,7 @@ export default {
             </li>
             <li>
               <a
-                class="accept-merge-request"
+                class="accept-merge-request qa-merge-immediately-option"
                 href="#"
                 @click.prevent="handleMergeButtonClick(false, true)">
                 <span class="media">

app/assets/stylesheets/framework/responsive_tables.scss

@@ -39,7 +39,7 @@
 .table-section {
   white-space: nowrap;
 
-  $section-widths: 10 15 20 25 30 40 50 100;
+  $section-widths: 5 10 15 20 25 30 40 50 100;
   @each $width in $section-widths {
     &.section-#{$width} {
       flex: 0 0 #{$width + '%'};

app/controllers/omniauth_callbacks_controller.rb

@@ -154,7 +154,11 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
       message << "Create a GitLab account first, and then connect it to your #{label} account."
     end
 
+<<<<<<< HEAD
     flash[:alert] = message.join(' ')
+=======
+    flash[:notice] = message.join(' ')
+>>>>>>> upstream/master
     redirect_to new_user_session_path
   end
 

app/views/admin/runners/_runner.html.haml

 .gl-responsive-table-row{ id: dom_id(runner) }
-  = render layout: 'runner_table_cell', locals: { label: _('Type') } do
-    - if runner.instance_type?
-      %span.badge.badge-success shared
-    - elsif runner.group_type?
-      %span.badge.badge-success group
-    - else
-      %span.badge.badge-info specific
-    - if runner.locked?
-      %span.badge.badge-warning locked
-    - unless runner.active?
-      %span.badge.badge-danger paused
-
-  = render layout: 'runner_table_cell', locals: { label: _('Runner token') } do
-    = link_to runner.short_sha, admin_runner_path(runner)
-
-  = render layout: 'runner_table_cell', locals: { label: _('Description') } do
-    = runner.description
-
-  = render layout: 'runner_table_cell', locals: { label: _('Version') } do
-    = runner.version
-
-  = render layout: 'runner_table_cell', locals: { label: _('IP Address') } do
-    = runner.ip_address
-
-  = render layout: 'runner_table_cell', locals: { label: _('Projects') } do
-    - if runner.instance_type? || runner.group_type?
-      = _('n/a')
-    - else
-      = runner.projects.count(:all)
-
-  = render layout: 'runner_table_cell', locals: { label: _('Jobs') } do
-    = runner.builds.count(:all)
-
-  = render layout: 'runner_table_cell', locals: { label: _('Tags') } do
-    - runner.tag_list.sort.each do |tag|
-      %span.badge.badge-primary
-        = tag
-
-  = render layout: 'runner_table_cell', locals: { label: _('Last contact') } do
-    - if runner.contacted_at
-      = time_ago_with_tooltip runner.contacted_at
-    - else
-      = _('Never')
+  .table-section.section-10.section-wrap
+    .table-mobile-header{ role: 'rowheader' }= _('Type')
+    .table-mobile-content
+      - if runner.instance_type?
+        %span.badge.badge-success shared
+      - elsif runner.group_type?
+        %span.badge.badge-success group
+      - else
+        %span.badge.badge-info specific
+      - if runner.locked?
+        %span.badge.badge-warning locked
+      - unless runner.active?
+        %span.badge.badge-danger paused
+
+  .table-section.section-10
+    .table-mobile-header{ role: 'rowheader' }= _('Runner token')
+    .table-mobile-content
+      = link_to runner.short_sha, admin_runner_path(runner)
+
+  .table-section.section-15
+    .table-mobile-header{ role: 'rowheader' }= _('Description')
+    .table-mobile-content.str-truncated.has-tooltip{ title: runner.description }
+      = runner.description
+
+  .table-section.section-15
+    .table-mobile-header{ role: 'rowheader' }= _('Version')
+    .table-mobile-content.str-truncated.has-tooltip{ title: runner.version }
+      = runner.version
+
+  .table-section.section-10
+    .table-mobile-header{ role: 'rowheader' }= _('IP Address')
+    .table-mobile-content
+      = runner.ip_address
+
+  .table-section.section-5
+    .table-mobile-header{ role: 'rowheader' }= _('Projects')
+    .table-mobile-content
+      - if runner.instance_type? || runner.group_type?
+        = _('n/a')
+      - else
+        = runner.projects.count(:all)
+
+  .table-section.section-5
+    .table-mobile-header{ role: 'rowheader' }= _('Jobs')
+    .table-mobile-content
+      = runner.builds.count(:all)
+
+  .table-section.section-10.section-wrap
+    .table-mobile-header{ role: 'rowheader' }= _('Tags')
+    .table-mobile-content
+      - runner.tag_list.sort.each do |tag|
+        %span.badge.badge-primary
+          = tag
+
+  .table-section.section-10
+    .table-mobile-header{ role: 'rowheader' }= _('Last contact')
+    .table-mobile-content
+      - if runner.contacted_at
+        = time_ago_with_tooltip runner.contacted_at
+      - else
+        = _('Never')
 
   .table-section.table-button-footer.section-10
     .btn-group.table-action-buttons

app/views/admin/runners/_runner_table_cell.html.haml

-.table-section.section-10
-  .table-mobile-header{ role: 'rowheader' }= label
-  .table-mobile-content
-    = yield

app/views/admin/runners/index.html.haml

@@ -98,8 +98,16 @@
     .runners-content.content-list
       .table-holder
         .gl-responsive-table-row.table-row-header{ role: 'row' }
-          - [_('Type'), _('Runner token'), _('Description'), _('Version'), _('IP Address'), _('Projects'), _('Jobs'), _('Tags'), _('Last contact')].each do |label|
-            .table-section.section-10{ role: 'rowheader' }= label
+          .table-section.section-10{ role: 'rowheader' }= _('Type')
+          .table-section.section-10{ role: 'rowheader' }= _('Runner token')
+          .table-section.section-15{ role: 'rowheader' }= _('Description')
+          .table-section.section-15{ role: 'rowheader' }= _('Version')
+          .table-section.section-10{ role: 'rowheader' }= _('IP Address')
+          .table-section.section-5{ role: 'rowheader' }= _('Projects')
+          .table-section.section-5{ role: 'rowheader' }= _('Jobs')
+          .table-section.section-10{ role: 'rowheader' }= _('Tags')
+          .table-section.section-10{ role: 'rowheader' }= _('Last contact')
+          .table-section.section-10{ role: 'rowheader' }
 
         - @runners.each do |runner|
           = render 'admin/runners/runner', runner: runner

changelogs/unreleased/51549-runners-table.yml

+---
+title: Fixes admin runners table not wrapping content
+merge_request:
+author:
+type: fixed

doc/administration/job_artifacts.md

@@ -127,6 +127,7 @@ The connection settings match those provided by [Fog](https://github.com/fog), a
 | `host` | S3 compatible host for when not using AWS, e.g. `localhost` or `storage.example.com` | s3.amazonaws.com |
 | `endpoint` | Can be used when configuring an S3 compatible service such as [Minio](https://www.minio.io), by entering a URL such as `http://127.0.0.1:9000` | (optional) |
 | `path_style` | Set to true to use `host/bucket_name/object` style paths instead of `bucket_name.host/object`. Leave as false for AWS S3 | false |
+| `use_iam_profile` | Set to true to use IAM profile instead of access keys | false
 
 **In Omnibus installations:**
 

doc/administration/uploads.md

@@ -86,6 +86,7 @@ The connection settings match those provided by [Fog](https://github.com/fog), a
 | `host` | S3 compatible host for when not using AWS, e.g. `localhost` or `storage.example.com` | s3.amazonaws.com |
 | `endpoint` | Can be used when configuring an S3 compatible service such as [Minio](https://www.minio.io), by entering a URL such as `http://127.0.0.1:9000` | (optional) |
 | `path_style` | Set to true to use `host/bucket_name/object` style paths instead of `bucket_name.host/object`. Leave as false for AWS S3 | false |
+| `use_iam_profile` | Set to true to use IAM profile instead of access keys | false
 
 **In Omnibus installations:**
 

doc/user/project/integrations/webhooks.md

@@ -82,6 +82,14 @@ You can turn this off in the webhook settings in your GitLab projects.
 
 ![SSL Verification](img/webhooks_ssl.png)
 
+## Branch filtering
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/20338) in GitLab 11.3.
+
+Push events can be filtered by branch using a branch name or wildcard pattern
+to limit which push events are sent to your webhook endpoint. By default the
+field is blank causing all push events to be sent to your webhook endpoint.
+
 ## Events
 
 Below are described the supported events.

doc/user/project/wiki/index.md

@@ -40,11 +40,6 @@ support Markdown, RDoc and AsciiDoc. For Markdown based pages, all the
 [Markdown features](../../markdown.md) are supported and for links there is
 some [wiki specific](../../markdown.md#wiki-specific-markdown) behavior.
 
->**Note:**
-The wiki is based on a Git repository and contains only text files. Uploading
-files via the web interface will upload them in GitLab itself, and they will
-not be available if you clone the wiki repo locally.
-
 In the web interface the commit message is optional, but the GitLab Wiki is
 based on Git and needs a commit message, so one will be created for you if you
 do not enter one.
@@ -53,6 +48,14 @@ When you're ready, click the **Create page** and the new page will be created.
 
 ![New page](img/wiki_create_new_page.png)
 
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/33475) in GitLab 11.3.
+
+Starting with GitLab 11.3, any file that is uploaded to the wiki via GitLab's
+interface will be stored in the wiki Git repository, and it will be available
+if you clone the wiki repository locally. All uploaded files prior to GitLab
+11.3 are stored in GitLab itself. If you want them to be part of the wiki's Git
+repository, you will have to upload them again.
+
 ## Editing a wiki page
 
 To edit a page, simply click on the **Edit** button. From there on, you can

doc/workflow/lfs/lfs_administration.md

@@ -95,6 +95,7 @@ Here is a configuration example with S3.
 | `host` | S3 compatible host for when not using AWS, e.g. `localhost` or `storage.example.com` | s3.amazonaws.com |
 | `endpoint` | Can be used when configuring an S3 compatible service such as [Minio](https://www.minio.io), by entering a URL such as `http://127.0.0.1:9000` | (optional) |
 | `path_style` | Set to true to use `host/bucket_name/object` style paths instead of `bucket_name.host/object`. Leave as false for AWS S3 | false |
+| `use_iam_profile` | Set to true to use IAM profile instead of access keys | false
 
 Here is a configuration example with GCS.
 

qa/qa/page/merge_request/show.rb

@@ -7,6 +7,9 @@ module QA
         view 'app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue' do
           element :merge_button
           element :fast_forward_message, 'Fast-forward merge without a merge commit'
+          element :merge_moment_dropdown
+          element :merge_when_pipeline_succeeds_option
+          element :merge_immediately_option
         end
 
         view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue' do
@@ -29,7 +32,20 @@ module QA
         def has_merge_button?
           refresh
 
-          has_selector?('.accept-merge-request')
+          has_css?(element_selector_css(:merge_button))
+        end
+
+        def has_merge_options?
+          has_css?(element_selector_css(:merge_moment_dropdown))
+        end
+
+        def merge_immediately
+          if has_merge_options?
+            click_element :merge_moment_dropdown
+            click_element :merge_immediately_option
+          else
+            click_element :merge_button
+          end
         end
 
         def rebase!
@@ -61,7 +77,7 @@ module QA
             !first(element_selector_css(:merge_button)).disabled?
           end
 
-          click_element :merge_button
+          merge_immediately
 
           wait(reload: false) do
             has_text?('The changes were merged into')