Add latest changes from gitlab-org/gitlab@master

b5ad0617 · GitLab Bot · 0a6ffb54 · b5ad0617 · b5ad0617 · b5ad0617
Commit b5ad0617 authored 5 years ago by GitLab Bot
--- a/Gemfile
+++ b/Gemfile
@@ -452,7 +452,7 @@ group :ed25519 do
 end
  
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 1.70.0'
+gem 'gitaly', '~> 1.73.0'
  
 gem 'grpc', '~> 1.24.0'
  

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -359,7 +359,7 @@ GEM
      po_to_json (>= 1.0.0)
      rails (>= 3.2.0)
    git (1.5.0)
-    gitaly (1.70.0)
+    gitaly (1.73.0)
      grpc (~> 1.0)
    github-markup (1.7.0)
    gitlab-labkit (0.7.0)
@@ -1193,7 +1193,7 @@ DEPENDENCIES
  gettext (~> 3.2.2)
  gettext_i18n_rails (~> 1.8.0)
  gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 1.70.0)
+  gitaly (~> 1.73.0)
  github-markup (~> 1.7.0)
  gitlab-labkit (~> 0.5)
  gitlab-license (~> 1.0)

--- a/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
+++ b/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
@@ -59,6 +59,9 @@ export default {
    collapsedButtonIcon() {
      return this.isTodo ? 'todo-done' : 'todo-add';
    },
+    collapsedButtonIconVisible() {
+      return this.collapsed && !this.isActionActive;
+    },
  },
  methods: {
    handleButtonClick() {
@@ -82,8 +85,12 @@ export default {
    data-boundary="viewport"
    @click="handleButtonClick"
  >
-    <icon v-show="collapsed" :class="collapsedButtonIconClasses" :name="collapsedButtonIcon" />
-    <span v-show="!collapsed" class="issuable-todo-inner"> {{ buttonLabel }} </span>
+    <icon
+      v-show="collapsedButtonIconVisible"
+      :class="collapsedButtonIconClasses"
+      :name="collapsedButtonIcon"
+    />
+    <span v-show="!collapsed" class="issuable-todo-inner">{{ buttonLabel }}</span>
    <gl-loading-icon v-show="isActionActive" :inline="true" />
  </button>
 </template>
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -61,10 +61,6 @@
  padding-right: 0;
  z-index: 300;
  
-  .btn-sidebar-action {
-    display: inline-flex;
-  }
-
  @include media-breakpoint-only(sm) {
    &:not(.wiki-sidebar):not(.build-sidebar):not(.issuable-bulk-update-sidebar) .content-wrapper {
      padding-right: $gutter-collapsed-width;

--- a/app/models/project_auto_devops.rb
+++ b/app/models/project_auto_devops.rb
@@ -16,6 +16,7 @@ class ProjectAutoDevops < ApplicationRecord
  
  def predefined_variables
    Gitlab::Ci::Variables::Collection.new.tap do |variables|
+      variables.append(key: 'AUTO_DEVOPS_EXPLICITLY_ENABLED', value: '1') if enabled?
      variables.concat(deployment_strategy_default_variables)
    end
  end

--- a/app/services/git/base_hooks_service.rb
+++ b/app/services/git/base_hooks_service.rb
@@ -85,12 +85,36 @@ module Git
        before: oldrev,
        after: newrev,
        ref: ref,
+        variables_attributes: generate_vars_from_push_options || [],
        push_options: params[:push_options] || {},
        checkout_sha: Gitlab::DataBuilder::Push.checkout_sha(
          project.repository, newrev, ref)
      }
    end
  
+    def ci_variables_from_push_options
+      strong_memoize(:ci_variables_from_push_options) do
+        params[:push_options]&.deep_symbolize_keys&.dig(:ci, :variable)
+      end
+    end
+
+    def generate_vars_from_push_options
+      return [] unless ci_variables_from_push_options
+
+      ci_variables_from_push_options.map do |var_definition, _count|
+        key, value = var_definition.to_s.split("=", 2)
+
+        # Accept only valid format. We ignore the following formats
+        # 1. "=123". In this case, `key` will be an empty string
+        # 2. "FOO". In this case, `value` will be nil.
+        # However, the format "FOO=" will result in key beign `FOO` and value
+        # being an empty string. This is acceptable.
+        next if key.blank? || value.nil?
+
+        { "key" => key, "variable_type" => "env_var", "secret_value" => value }
+      end.compact
+    end
+
    def push_data_params(commits:, with_changed_files: true)
      {
        oldrev: oldrev,

--- a/changelogs/unreleased/6971-epic-sidebar-updates.yml
+++ b/changelogs/unreleased/6971-epic-sidebar-updates.yml
+---
+title: Vertically align collapse button on epic sidebar
+merge_request: 19656
+author:
+type: fixed
--- a/changelogs/unreleased/auto_devops_enabled_ci_variable.yml
+++ b/changelogs/unreleased/auto_devops_enabled_ci_variable.yml
+---
+title: Add CI variable to show when Auto-DevOps is explicitly enabled
+merge_request: 20332
+author:
+type: changed
--- a/changelogs/unreleased/push-option-ci-variables.yml
+++ b/changelogs/unreleased/push-option-ci-variables.yml
+---
+title: Support passing CI variables via git push options
+merge_request: 20255
+author:
+type: added
--- a/doc/README.md
+++ b/doc/README.md
@@ -87,7 +87,7 @@ The following documentation relates to the DevOps **Manage** stage:
 | Manage Topics                                                                         | Description                                                                                                                                                                                                                  |
 |:--------------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [Authentication and<br/>Authorization](administration/auth/README.md) **(CORE ONLY)** | Supported authentication and authorization providers.                                                                                                                                                                        |
-| [GitLab Cycle Analytics](user/project/cycle_analytics.md)                             | Measure the time it takes to go from an [idea to production](https://about.gitlab.com/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/#from-idea-to-production-with-gitlab) for each project you have. |
+| [GitLab Cycle Analytics](user/project/cycle_analytics.md)                             | Measure the time it takes to go from an [idea to production](https://about.gitlab.com/blog/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/#from-idea-to-production-with-gitlab) for each project you have. |
 | [Instance Statistics](user/instance_statistics/index.md)                              | Discover statistics on how many GitLab features you use and user activity.                                                                                                                                                   |
  
 <div align="right">
@@ -376,7 +376,7 @@ We have the following documentation to rapidly uplift your GitLab knowledge:
 | Topic                                                                                                                  | Description                                                    |
 |:-----------------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------------|
 | [GitLab basics guides](gitlab-basics/README.md)                                                                        | Start working on the command line and with GitLab.             |
-| [GitLab workflow overview](https://about.gitlab.com/2016/10/25/gitlab-workflow-an-overview/)                           | Enhance your workflow with the best of GitLab Workflow.        |
+| [GitLab workflow overview](https://about.gitlab.com/blog/2016/10/25/gitlab-workflow-an-overview/)                           | Enhance your workflow with the best of GitLab Workflow.        |
 | [Get started with GitLab CI/CD](ci/quick_start/README.md)                                                              | Quickly implement GitLab CI/CD.                                |
 | [Auto DevOps](topics/autodevops/index.md)                                                                              | Learn more about GitLab's Auto DevOps.                         |
 | [GitLab Markdown](user/markdown.md)                                                                                    | GitLab's advanced formatting system (GitLab Flavored Markdown) |

--- a/doc/development/contributing/merge_request_workflow.md
+++ b/doc/development/contributing/merge_request_workflow.md
@@ -248,3 +248,16 @@ request:
 1. The [GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit).
 1. The [CI environment preparation](https://gitlab.com/gitlab-org/gitlab/blob/master/scripts/prepare_build.sh).
 1. The [Omnibus package creator](https://gitlab.com/gitlab-org/omnibus-gitlab).
+
+### Incremental improvements
+
+We allow engineering time to fix small problems (with or without an
+issue) that are incremental improvements, such as:
+
+1. Unprioritized bug fixes (e.g. [Banner alerting of project move is
+showing up everywhere](https://gitlab.com/gitlab-org/gitlab/merge_requests/18985))
+1. Documentation improvements
+1. Rubocop or Code Quality improvements
+
+Tag a merge request with ~"Stuff that should Just Work" to track work in
+this area.
--- a/doc/development/fe_guide/accessibility.md
+++ b/doc/development/fe_guide/accessibility.md
@@ -16,5 +16,5 @@ useful compilation of accessibility-related material.
 [audit-rules]: https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules
 [axe-website]: https://www.deque.com/axe/
 [axe-firefox-extension]: https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/
-[axe-chrome-extension]: https://chrome.google.com/webstore/detail/axe/lhdoppojpmngadmnindnejefpokejbdd
+[axe-chrome-extension]: https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd
 [awesome-a11y]: https://github.com/brunopulis/awesome-a11y
--- a/doc/development/fe_guide/style_guide_scss.md
+++ b/doc/development/fe_guide/style_guide_scss.md
@@ -28,7 +28,7 @@ New utility classes should be added to [`utilities.scss`](https://gitlab.com/git
  
 - `{variant}` is one of 'primary', 'secondary', 'success', 'warning', 'error'
 - `{shade}` is one of the shades listed on [colors](https://design.gitlab.com/product-foundations/colors/)
- `{size}` is a number from 1-6 from our [Type scale](https://design.gitlab.com/product-foundations/typography)
+- `{size}` is a number from 1-6 from our [Type scale](https://design.gitlab.com/product-foundations/typography/)
  
 #### When should I create component classes?
  

--- a/doc/development/gotchas.md
+++ b/doc/development/gotchas.md
@@ -155,7 +155,7 @@ refresh_service.execute(oldrev, newrev, ref)
 See ["Why is it bad style to `rescue Exception => e` in Ruby?"](https://stackoverflow.com/questions/10048173/why-is-it-bad-style-to-rescue-exception-e-in-ruby).
  
 _**Note:** This rule is [enforced automatically by
-Rubocop](https://gitlab.com/gitlab-org/gitlab/blob/8-4-stable/.rubocop.yml#L911-914)._
+Rubocop](https://gitlab.com/gitlab-org/gitlab-foss/blob/8-4-stable/.rubocop.yml#L911-914)._
  
 ## Do not use inline JavaScript in views
  

--- a/doc/development/issuable-like-models.md
+++ b/doc/development/issuable-like-models.md
 # Issuable-like Rails models utilities
  
-GitLab Rails codebase contains several models that hold common functionality and behave similarly to an [Issue]. Other
-examples of `Issuable`s are [Merge Requests] and [Epics].
+GitLab Rails codebase contains several models that hold common functionality and behave similarly to
+[Issues](https://docs.gitlab.com/ee/user/project/issues/). Other examples of "issuables"
+are [Merge Requests](https://docs.gitlab.com/ee/user/project/merge_requests/) and
+[Epics](https://docs.gitlab.com/ee/user/group/epics/).
  
 This guide accumulates guidelines on working with such Rails models.
  
@@ -13,7 +15,3 @@ There are max length constraints for the most important text fields for `Issuabl
 - `title_html`: 800 chars
 - `description`: 1 megabyte
 - `description_html`: 5 megabytes
-
-[Issue]: https://docs.gitlab.com/ee/user/project/issues
-[Merge Requests]: https://docs.gitlab.com/ee/user/project/merge_requests
-[Epics]: https://docs.gitlab.com/ee/user/group/epics
--- a/doc/development/licensing.md
+++ b/doc/development/licensing.md
@@ -65,7 +65,6 @@ Libraries with the following licenses require legal approval for use:
 - [GNU GPL](https://choosealicense.com/licenses/gpl-3.0/) (version 1, [version 2][GPLv2], [version 3][GPLv3], or any future versions): GPL-licensed libraries cannot be linked to from non-GPL projects.
 - [GNU AGPLv3](https://choosealicense.com/licenses/agpl-3.0/): AGPL-licensed libraries cannot be linked to from non-GPL projects.
 - [Open Software License (OSL)][OSL]: is a copyleft license. In addition, the FSF [recommend against its use][OSL-GNU].
- [Facebook BSD + PATENTS][Facebook]: is a 3-clause BSD license with a patent grant that has been deemed [Category X][x-list] by the Apache foundation.
 - [WTFPL][WTFPL]: is a public domain dedication [rejected by the OSI (3.2)][WTFPL-OSI]. Also has a strong language which is not in accordance with our diversity policy.
  
 ## GPL Cooperation Commitment
@@ -124,7 +123,6 @@ Dependencies which are only used in development or test environment are exempt f
 [Org-Repo]: https://gitlab.com/gitlab-com/organization
 [UNLICENSE]: https://unlicense.org
 [OWFa1]: http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0
-[Facebook]: https://code.facebook.com/pages/850928938376556
 [x-list]: https://www.apache.org/legal/resolved.html#category-x
 [Acceptable-Licenses]: #acceptable-licenses
 [Unacceptable-Licenses]: #unacceptable-licenses

--- a/doc/development/logging.md
+++ b/doc/development/logging.md
@@ -39,7 +39,7 @@ Note that currently on GitLab.com, any messages in `production.log` will
 NOT get indexed by Elasticsearch due to the sheer volume and noise. They
 do end up in Google Stackdriver, but it is still harder to search for
 logs there. See the [GitLab.com logging
-documentation](https://gitlab.com/gitlab-com/runbooks/blob/master/howto/logging.md)
+documentation](https://gitlab.com/gitlab-com/runbooks/blob/master/logging/doc/README.md)
 for more details.
  
 ## Use structured (JSON) logging

--- a/doc/development/testing_guide/testing_migrations_guide.md
+++ b/doc/development/testing_guide/testing_migrations_guide.md
@@ -104,9 +104,9 @@ end
 ### Example database migration test
  
 This spec tests the
-[`db/post_migrate/20170526185842_migrate_pipeline_stages.rb`](https://gitlab.com/gitlab-org/gitlab/blob/v11.6.5/db/post_migrate/20170526185842_migrate_pipeline_stages.rb)
+[`db/post_migrate/20170526185842_migrate_pipeline_stages.rb`](https://gitlab.com/gitlab-org/gitlab-foss/blob/v11.6.5/db/post_migrate/20170526185842_migrate_pipeline_stages.rb)
 migration. You can find the complete spec in
-[`spec/migrations/migrate_pipeline_stages_spec.rb`](https://gitlab.com/gitlab-org/gitlab/blob/v11.6.5/spec/migrations/migrate_pipeline_stages_spec.rb).
+[`spec/migrations/migrate_pipeline_stages_spec.rb`](https://gitlab.com/gitlab-org/gitlab-foss/blob/v11.6.5/spec/migrations/migrate_pipeline_stages_spec.rb).
  
 ```ruby
 require 'spec_helper'
@@ -171,9 +171,9 @@ end
 ### Example background migration test
  
 This spec tests the
-[`lib/gitlab/background_migration/archive_legacy_traces.rb`](https://gitlab.com/gitlab-org/gitlab/blob/v11.6.5/lib/gitlab/background_migration/archive_legacy_traces.rb)
+[`lib/gitlab/background_migration/archive_legacy_traces.rb`](https://gitlab.com/gitlab-org/gitlab-foss/blob/v11.6.5/lib/gitlab/background_migration/archive_legacy_traces.rb)
 background migration. You can find the complete spec on
-[`spec/lib/gitlab/background_migration/archive_legacy_traces_spec.rb`](https://gitlab.com/gitlab-org/gitlab/blob/v11.6.5/spec/lib/gitlab/background_migration/archive_legacy_traces_spec.rb)
+[`spec/lib/gitlab/background_migration/archive_legacy_traces_spec.rb`](https://gitlab.com/gitlab-org/gitlab-foss/blob/v11.6.5/spec/lib/gitlab/background_migration/archive_legacy_traces_spec.rb)
  
 ```ruby
 require 'spec_helper'

--- a/doc/university/README.md
+++ b/doc/university/README.md
@@ -196,8 +196,8 @@ The GitLab University curriculum is composed of GitLab videos, screencasts, pres
 ## 4. External Articles
  
 1. [2011 WSJ article by Marc Andreessen - Software is Eating the World](https://www.wsj.com/articles/SB10001424053111903480904576512250915629460)
-1. [2014 Blog post by Chris Dixon - Software eats software development](http://cdixon.org/2014/04/13/software-eats-software-development/)
-1. [2015 Venture Beat article - Actually, Open Source is Eating the World](http://venturebeat.com/2015/12/06/its-actually-open-source-software-thats-eating-the-world/)
+1. [2014 Blog post by Chris Dixon - Software eats software development](https://cdixon.org/2014/04/13/software-eats-software-development)
+1. [2015 Venture Beat article - Actually, Open Source is Eating the World](https://venturebeat.com/2015/12/06/its-actually-open-source-software-thats-eating-the-world/)
  
 ## 5. Resources for GitLab Team Members
  

--- a/doc/user/project/milestones/index.md
+++ b/doc/user/project/milestones/index.md
@@ -68,8 +68,8 @@ If you are expanding from a few projects to a larger number of projects within t
  
 From the project milestone list page, you can promote a project milestone to a group milestone. This will merge all project milestones across all projects in this group with the same name into a single group milestones. All issues and merge requests that previously were assigned one of these project milestones will now be assigned the new group milestones. This action cannot be reversed and the changes are permanent.
  
->**Note:**
-Not all features on the project milestone view are available on the group milestone view. If you promote a project milestone to a group milestone, you will lose these features. See [Milestone view](#milestone-view) to see which features are missing from the group milestone view.
+CAUTION: **Caution:**
+From GitLab 12.4 and earlier, some information is lost when you promote a project milestone to a group milestone. Not all features on the project milestone view are available on the group milestone view. If you promote a project milestone to a group milestone, you will lose these features. See [Milestone view](#milestone-view) to see which features are missing from the group milestone view.
  
 ![Promote milestone](img/milestones_promote_milestone.png)