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

# Conflicts:
#	db/schema.rb
#	doc/api/issues.md
#	doc/api/merge_requests.md

[ci skip]

app/assets/javascripts/environments/components/environment_item.vue

@@ -15,7 +15,7 @@ import CommitComponent from '../../vue_shared/components/commit.vue';
 import eventHub from '../event_hub';
 
 /**
- * Envrionment Item Component
+ * Environment Item Component
  *
  * Renders a table row for each environment.
  */
@@ -60,7 +60,7 @@ export default {
 
   computed: {
     /**
-     * Verifies if `last_deployment` key exists in the current Envrionment.
+     * Verifies if `last_deployment` key exists in the current Environment.
      * This key is required to render most of the html - this method works has
      * an helper.
      *

app/assets/javascripts/filtered_search/filtered_search_dropdown.js

@@ -85,7 +85,7 @@ export default class FilteredSearchDropdown {
   }
 
   dispatchInputEvent() {
-    // Propogate input change to FilteredSearchDropdownManager
+    // Propagate input change to FilteredSearchDropdownManager
     // so that it can determine which dropdowns to open
     this.input.dispatchEvent(
       new CustomEvent('input', {

app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js

@@ -68,12 +68,12 @@ export const conditions = [
     value: 'any',
   },
   {
-    url: 'milestone_title=No+Milestone',
+    url: 'milestone_title=None',
     tokenKey: 'milestone',
     value: 'none',
   },
   {
-    url: 'milestone_title=Any+Milestone',
+    url: 'milestone_title=Any',
     tokenKey: 'milestone',
     value: 'any',
   },

app/assets/javascripts/gl_field_errors.js

@@ -28,7 +28,7 @@ export default class GlFieldErrors {
     this.form.on('submit', GlFieldErrors.catchInvalidFormSubmit);
   }
 
-  /* Neccessary to prevent intercept and override invalid form submit
+  /* Necessary to prevent intercept and override invalid form submit
    * because Safari & iOS quietly allow form submission when form is invalid
    * and prevents disabling of invalid submit button by application.js */
 

app/assets/javascripts/notes/components/note_awards_list.vue

@@ -110,7 +110,7 @@ export default {
       // Get the remaining list to use in `and x more` text.
       const remainingAwardList = awardList.slice(TOOLTIP_NAME_COUNT, awardList.length);
 
-      // Add myself to the begining of the list so title will start with You.
+      // Add myself to the beginning of the list so title will start with You.
       if (hasReactionByCurrentUser) {
         namesToShow.unshift('You');
       }

app/assets/javascripts/notes/stores/collapse_utils.js

@@ -70,7 +70,7 @@ export const collapseSystemNotes = notes => {
       } else if (lastDescriptionSystemNote) {
         const timeDifferenceMinutes = getTimeDifferenceMinutes(lastDescriptionSystemNote, note);
 
-        // are they less than 10 minutes appart?
+        // are they less than 10 minutes apart?
         if (timeDifferenceMinutes > 10) {
           // reset counter
           descriptionChangedTimes = 1;

app/assets/javascripts/vue_shared/components/commit.vue

@@ -13,7 +13,7 @@ export default {
   },
   props: {
     /**
-     * Indicates the existance of a tag.
+     * Indicates the existence of a tag.
      * Used to render the correct icon, if true will render `fa-tag` icon,
      * if false will render a svg sprite fork icon
      */

app/assets/stylesheets/framework/dropdowns.scss

@@ -158,7 +158,7 @@
   color: $gl-text-color;
   outline: 0;
 
-  // make sure the text color is not overriden
+  // make sure the text color is not overridden
   &.text-danger {
     color: $brand-danger;
   }
@@ -184,7 +184,7 @@
   text-align: left;
   width: 100%;
 
-  // make sure the text color is not overriden
+  // make sure the text color is not overridden
   &.text-danger {
     color: $brand-danger;
   }

app/controllers/admin/appearances_controller.rb

@@ -35,21 +35,21 @@ class Admin::AppearancesController < Admin::ApplicationController
 
     @appearance.save
 
-    redirect_to admin_appearances_path, notice: 'Logo was succesfully removed.'
+    redirect_to admin_appearances_path, notice: 'Logo was successfully removed.'
   end
 
   def header_logos
     @appearance.remove_header_logo!
     @appearance.save
 
-    redirect_to admin_appearances_path, notice: 'Header logo was succesfully removed.'
+    redirect_to admin_appearances_path, notice: 'Header logo was successfully removed.'
   end
 
   def favicon
     @appearance.remove_favicon!
     @appearance.save
 
-    redirect_to admin_appearances_path, notice: 'Favicon was succesfully removed.'
+    redirect_to admin_appearances_path, notice: 'Favicon was successfully removed.'
   end
 
   private

app/controllers/import/gitea_controller.rb

@@ -23,7 +23,7 @@ class Import::GiteaController < Import::GithubController
     :"#{provider}_host_url"
   end
 
-  # Overriden methods
+  # Overridden methods
   def provider
     :gitea
   end

app/controllers/import/github_controller.rb

@@ -105,7 +105,7 @@ class Import::GithubController < Import::BaseController
     { github_access_token: session[access_token_key] }
   end
 
-  # The following methods are overriden in subclasses
+  # The following methods are overridden in subclasses
   def provider
     :github
   end

app/controllers/oauth/authorizations_controller.rb

@@ -3,7 +3,7 @@
 class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   layout 'profile'
 
-  # Overriden from Doorkeeper::AuthorizationsController to
+  # Overridden from Doorkeeper::AuthorizationsController to
   # include the call to session.delete
   def new
     if pre_auth.authorizable?

app/controllers/projects_controller.rb

@@ -278,7 +278,7 @@ class ProjectsController < Projects::ApplicationController
   # rubocop: enable CodeReuse/ActiveRecord
 
   # Render project landing depending of which features are available
-  # So if page is not availble in the list it renders the next page
+  # So if page is not available in the list it renders the next page
   #
   # pages list order: repository readme, wiki home, issues list, customize workflow
   def render_landing_page

app/finders/issuable_finder.rb

@@ -192,10 +192,6 @@ class IssuableFinder
     params[:milestone_title].present?
   end
 
-  def filter_by_no_milestone?
-    milestones? && params[:milestone_title] == Milestone::None.title
-  end
-
   def milestones
     return @milestones if defined?(@milestones)
 
@@ -432,18 +428,6 @@ class IssuableFinder
   end
   # rubocop: enable CodeReuse/ActiveRecord
 
-  def filter_by_upcoming_milestone?
-    params[:milestone_title] == Milestone::Upcoming.name
-  end
-
-  def filter_by_any_milestone?
-    params[:milestone_title] == Milestone::Any.title
-  end
-
-  def filter_by_started_milestone?
-    params[:milestone_title] == Milestone::Started.name
-  end
-
   # rubocop: disable CodeReuse/ActiveRecord
   def by_milestone(items)
     if milestones?
@@ -465,6 +449,24 @@ class IssuableFinder
   end
   # rubocop: enable CodeReuse/ActiveRecord
 
+  def filter_by_no_milestone?
+    # Accepts `No Milestone` for compatibility
+    params[:milestone_title].to_s.downcase == FILTER_NONE || params[:milestone_title] == Milestone::None.title
+  end
+
+  def filter_by_any_milestone?
+    # Accepts `Any Milestone` for compatibility
+    params[:milestone_title].to_s.downcase == FILTER_ANY || params[:milestone_title] == Milestone::Any.title
+  end
+
+  def filter_by_upcoming_milestone?
+    params[:milestone_title] == Milestone::Upcoming.name
+  end
+
+  def filter_by_started_milestone?
+    params[:milestone_title] == Milestone::Started.name
+  end
+
   def by_label(items)
     return items unless labels?
 

app/helpers/page_layout_helper.rb

@@ -10,7 +10,7 @@ module PageLayoutHelper
       @breadcrumb_title = @page_title.last
     end
 
-    # Segments are seperated by middot
+    # Segments are separated by middot
     @page_title.join(" · ")
   end
 

app/models/commit_status.rb

@@ -169,12 +169,12 @@ class CommitStatus < ActiveRecord::Base
     false
   end
 
-  # To be overriden when inherrited from
+  # To be overridden when inherrited from
   def retryable?
     false
   end
 
-  # To be overriden when inherrited from
+  # To be overridden when inherrited from
   def cancelable?
     false
   end

app/models/concerns/cacheable_attributes.rb

@@ -12,12 +12,12 @@ module CacheableAttributes
       "#{name}:#{Gitlab::VERSION}:#{Rails.version}".freeze
     end
 
-    # Can be overriden
+    # Can be overridden
     def current_without_cache
       last
     end
 
-    # Can be overriden
+    # Can be overridden
     def defaults
       {}
     end

app/models/concerns/fast_destroy_all.rb

@@ -7,7 +7,7 @@
 # `delete_all` is efficient as it deletes all rows with a single `DELETE` query.
 #
 # It's better to use `delete_all` as our best practice, however,
-# if external data (e.g. ObjectStorage, FileStorage or Redis) are assosiated with database records,
+# if external data (e.g. ObjectStorage, FileStorage or Redis) are associated with database records,
 # it is difficult to accomplish it.
 #
 # This module defines a format to use `delete_all` and delete associated external data.

app/models/concerns/issuable.rb

@@ -365,7 +365,7 @@ module Issuable
   end
 
   ##
-  # Overriden in MergeRequest
+  # Overridden in MergeRequest
   #
   def wipless_title_changed(old_title)
     old_title != title

app/models/concerns/storage/legacy_namespace.rb

@@ -94,7 +94,7 @@ module Storage
         if gitlab_shell.mv_namespace(repository_storage, full_path, new_path)
           Gitlab::AppLogger.info %Q(Namespace directory "#{full_path}" moved to "#{new_path}")
 
-          # Remove namespace directroy async with delay so
+          # Remove namespace directory async with delay so
           # GitLab has time to remove all projects first
           run_after_commit do
             GitlabShellWorker.perform_in(5.minutes, :rm_namespace, repository_storage, new_path)

app/models/concerns/with_uploads.rb

@@ -2,7 +2,7 @@
 
 # Mounted uploaders are destroyed by carrierwave's after_commit
 # hook. This hook fetches upload location (local vs remote) from
-# Upload model. So it's neccessary to make sure that during that
+# Upload model. So it's necessary to make sure that during that
 # after_commit hook model's associated uploads are not deleted yet.
 # IOW we can not use dependent: :destroy :
 # has_many :uploads, as: :model, dependent: :destroy

app/models/namespace.rb

@@ -84,7 +84,7 @@ class Namespace < ActiveRecord::Base
       find_by('lower(path) = :value', value: path.downcase)
     end
 
-    # Case insensetive search for namespace by path or name
+    # Case insensitive search for namespace by path or name
     def find_by_path_or_name(path)
       find_by("lower(path) = :path OR lower(name) = :path", path: path.downcase)
     end

app/models/project.rb

@@ -184,7 +184,7 @@ class Project < ActiveRecord::Base
   has_one :import_export_upload, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
 
   # Merge Requests for target project should be removed with it
-  has_many :merge_requests, foreign_key: 'target_project_id'
+  has_many :merge_requests, foreign_key: 'target_project_id', inverse_of: :target_project
   has_many :source_of_merge_requests, foreign_key: 'source_project_id', class_name: 'MergeRequest'
   has_many :issues
   has_many :labels, class_name: 'ProjectLabel'
@@ -668,7 +668,7 @@ class Project < ActiveRecord::Base
     remove_import_data
   end
 
-  # This method is overriden in EE::Project model
+  # This method is overridden in EE::Project model
   def remove_import_data
     import_data&.destroy
   end

app/models/project_services/issue_tracker_service.rb

@@ -9,7 +9,7 @@ class IssueTrackerService < Service
   # Override this method on services that uses different patterns
   # This pattern does not support cross-project references
   # The other code assumes that this pattern is a superset of all
-  # overriden patterns. See ReferenceRegexes::EXTERNAL_PATTERN
+  # overridden patterns. See ReferenceRegexes::EXTERNAL_PATTERN
   def self.reference_pattern(only_long: false)
     if only_long
       /(\b[A-Z][A-Z0-9_]+-)(?<issue>\d+)/

app/services/auth/container_registry_authentication_service.rb

@@ -99,7 +99,7 @@ module Auth
     ##
     # Because we do not have two way communication with registry yet,
     # we create a container repository image resource when push to the
-    # registry is successfuly authorized.
+    # registry is successfully authorized.
     #
     def ensure_container_repository!(path, actions)
       return if path.has_repository?

app/services/keys/destroy_service.rb

@@ -8,7 +8,7 @@ module Keys
       key.destroy if destroy_possible?(key)
     end
 
-    # overriden in EE::Keys::DestroyService
+    # overridden in EE::Keys::DestroyService
     def destroy_possible?(key)
       true
     end

app/services/members/base_service.rb

@@ -10,7 +10,7 @@ module Members
     end
 
     def after_execute(args)
-      # overriden in EE::Members modules
+      # overridden in EE::Members modules
     end
 
     private

app/services/projects/move_project_authorizations_service.rb

@@ -3,7 +3,7 @@
 # NOTE: This service cannot be used directly because it is part of a
 # a bigger process. Instead, use the service MoveAccessService which moves
 # project memberships, project group links, authorizations and refreshes
-# the authorizations if neccessary
+# the authorizations if necessary
 module Projects
   class MoveProjectAuthorizationsService < BaseMoveRelationsService
     def execute(source_project, remove_remaining_elements: true)

app/services/projects/move_project_group_links_service.rb

@@ -3,7 +3,7 @@
 # NOTE: This service cannot be used directly because it is part of a
 # a bigger process. Instead, use the service MoveAccessService which moves
 # project memberships, project group links, authorizations and refreshes
-# the authorizations if neccessary
+# the authorizations if necessary
 module Projects
   class MoveProjectGroupLinksService < BaseMoveRelationsService
     def execute(source_project, remove_remaining_elements: true)

app/services/projects/move_project_members_service.rb

@@ -3,7 +3,7 @@
 # NOTE: This service cannot be used directly because it is part of a
 # a bigger process. Instead, use the service MoveAccessService which moves
 # project memberships, project group links, authorizations and refreshes
-# the authorizations if neccessary
+# the authorizations if necessary
 module Projects
   class MoveProjectMembersService < BaseMoveRelationsService
     def execute(source_project, remove_remaining_elements: true)

app/services/quick_actions/interpret_service.rb

@@ -434,14 +434,14 @@ module QuickActions
       end
     end
 
-    desc 'Add or substract spent time'
+    desc 'Add or subtract spent time'
     explanation do |time_spent, time_spent_date|
       if time_spent
         if time_spent > 0
           verb = 'Adds'
           value = time_spent
         else
-          verb = 'Substracts'
+          verb = 'Subtracts'
           value = -time_spent
         end
 

app/views/projects/edit.html.haml

@@ -148,7 +148,7 @@
             = link_to 'Archive project', archive_project_path(@project),
                 data: { confirm: "Are you sure that you want to archive this project?" },
                 method: :post, class: "btn btn-warning"
-      .sub-section.rename-respository
+      .sub-section.rename-repository
         %h4.warning-title
           Rename repository
         = render 'projects/errors'

app/workers/gitlab/github_import/advance_stage_worker.rb

@@ -14,7 +14,7 @@ module Gitlab
       INTERVAL = 30.seconds.to_i
 
       # The number of seconds to wait (while blocking the thread) before
-      # continueing to the next waiter.
+      # continuing to the next waiter.
       BLOCKING_WAIT_TIME = 5
 
       # The known importer stages and their corresponding Sidekiq workers.

changelogs/unreleased/52382-filter-milestone-api-none-any.yml

+---
+title: Standardize milestones filter in APIs to None / Any
+merge_request: 22637
+author: Heinrich Lee Yu
+type: changed

changelogs/unreleased/drop-gcp-cluster-table.yml

+---
+title: Drop gcp_clusters table
+merge_request: 22713
+author:
+type: other

changelogs/unreleased/sh-optimize-merge-request-project-lookup.yml

+---
+title: Reduce SQL queries needed to load open merge requests
+merge_request: 22709
+author:
+type: performance

config/gitlab.yml.example

@@ -716,7 +716,7 @@ production: &base
   gitaly:
     # Path to the directory containing Gitaly client executables.
     client_path: /home/git/gitaly/bin
-    # Default Gitaly authentication token. Can be overriden per storage. Can
+    # Default Gitaly authentication token. Can be overridden per storage. Can
     # be left blank when Gitaly is running locally on a Unix socket, which
     # is the normal way to deploy Gitaly.
     token:

db/migrate/20181031190559_drop_gcp_clusters_table.rb

+# frozen_string_literal: true
+
+class DropGcpClustersTable < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    drop_table :gcp_clusters
+  end
+
+  def down
+    create_table :gcp_clusters do |t|
+      # Order columns by best align scheme
+      t.references :project, null: false, index: { unique: true }, foreign_key: { on_delete: :cascade }
+      t.references :user, foreign_key: { on_delete: :nullify }
+      t.references :service, foreign_key: { on_delete: :nullify }
+      t.integer :status
+      t.integer :gcp_cluster_size, null: false
+
+      # Timestamps
+      t.datetime_with_timezone :created_at, null: false
+      t.datetime_with_timezone :updated_at, null: false
+
+      # Enable/disable
+      t.boolean :enabled, default: true
+
+      # General
+      t.text :status_reason
+
+      # k8s integration specific
+      t.string :project_namespace
+
+      # Cluster details
+      t.string :endpoint
+      t.text :ca_cert
+      t.text :encrypted_kubernetes_token
+      t.string :encrypted_kubernetes_token_iv
+      t.string :username
+      t.text :encrypted_password
+      t.string :encrypted_password_iv
+
+      # GKE
+      t.string :gcp_project_id, null: false
+      t.string :gcp_cluster_zone, null: false
+      t.string :gcp_cluster_name, null: false
+      t.string :gcp_machine_type
+      t.string :gcp_operation_id
+      t.text :encrypted_gcp_token
+      t.string :encrypted_gcp_token_iv
+    end
+  end
+end

db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb

@@ -13,7 +13,7 @@ class CleanupMoveSystemUploadFolderSymlink < ActiveRecord::Migration
       say "Removing #{old_directory} -> #{new_directory} symlink"
       FileUtils.rm(old_directory)
     else
-      say "Symlink #{old_directory} non existant, nothing to do."
+      say "Symlink #{old_directory} non existent, nothing to do."
     end
   end
 

db/schema.rb

@@ -11,7 +11,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
+<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 20181017131623) do
+=======
+ActiveRecord::Schema.define(version: 20181031190559) do
+>>>>>>> upstream/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1109,6 +1113,7 @@ ActiveRecord::Schema.define(version: 20181017131623) do
 
   add_index "forked_project_links", ["forked_to_project_id"], name: "index_forked_project_links_on_forked_to_project_id", unique: true, using: :btree
 
+<<<<<<< HEAD
   create_table "gcp_clusters", force: :cascade do |t|
     t.integer "project_id", null: false
     t.integer "user_id"
@@ -1355,6 +1360,8 @@ ActiveRecord::Schema.define(version: 20181017131623) do
 
   add_index "geo_upload_deleted_events", ["upload_id"], name: "index_geo_upload_deleted_events_on_upload_id", using: :btree
 
+=======
+>>>>>>> upstream/master
   create_table "gpg_key_subkeys", force: :cascade do |t|
     t.integer "gpg_key_id", null: false
     t.binary "keyid"
@@ -3275,6 +3282,7 @@ ActiveRecord::Schema.define(version: 20181017131623) do
   add_foreign_key "fork_network_members", "projects", on_delete: :cascade
   add_foreign_key "fork_networks", "projects", column: "root_project_id", name: "fk_e7b436b2b5", on_delete: :nullify
   add_foreign_key "forked_project_links", "projects", column: "forked_to_project_id", name: "fk_434510edb0", on_delete: :cascade
+<<<<<<< HEAD
   add_foreign_key "gcp_clusters", "projects", on_delete: :cascade
   add_foreign_key "gcp_clusters", "services", on_delete: :nullify
   add_foreign_key "gcp_clusters", "users", on_delete: :nullify
@@ -3300,6 +3308,8 @@ ActiveRecord::Schema.define(version: 20181017131623) do
   add_foreign_key "geo_repository_renamed_events", "projects", on_delete: :cascade
   add_foreign_key "geo_repository_updated_events", "projects", on_delete: :cascade
   add_foreign_key "geo_reset_checksum_events", "projects", on_delete: :cascade
+=======
+>>>>>>> upstream/master
   add_foreign_key "gpg_key_subkeys", "gpg_keys", on_delete: :cascade
   add_foreign_key "gpg_keys", "users", on_delete: :cascade
   add_foreign_key "gpg_signatures", "gpg_key_subkeys", on_delete: :nullify

doc/api/issues.md

@@ -37,12 +37,15 @@ GET /issues?my_reaction_emoji=star
 | ------------------- | ---------------- | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `state`             | string           | no         | Return all issues or just those that are `opened` or `closed`                                                                                       |
 | `labels`            | string           | no         | Comma-separated list of label names, issues must have all labels to be returned. `No+Label` lists all issues with no labels                         |
-| `milestone`         | string           | no         | The milestone title. `No+Milestone` lists all issues with no milestone. `Any+Milestone` lists all issues that have an assigned milestone            |
+| `milestone`         | string           | no         | The milestone title. `None` lists all issues with no milestone. `Any` lists all issues that have an assigned milestone.                             |
 | `scope`             | string           | no         | Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`. Defaults to `created_by_me`<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13004] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
 | `author_id`         | integer          | no         | Return issues created by the given user `id`. Combine with `scope=all` or `scope=assigned_to_me`. _([Introduced][ce-13004] in GitLab 9.5)_          |
 | `assignee_id`       | integer          | no         | Return issues assigned to the given user `id`. `None` returns unassigned issues. `Any` returns issues with an assignee. _([Introduced][ce-13004] in GitLab 9.5)_ |
 | `my_reaction_emoji` | string           | no         | Return issues reacted by the authenticated user by the given `emoji`. `None` returns issues not given a reaction. `Any` returns issues given at least one reaction. _([Introduced][ce-14016] in GitLab 10.0)_ |
+<<<<<<< HEAD
 | `weight`            | integer          | no         | Return issues with the specified `weight`. `None` returns issues with no weight assigned. `Any` returns issues with a weight assigned.              |
+=======
+>>>>>>> upstream/master
 | `iids[]`            | Array[integer]   | no         | Return only the issues having the given `iid`                                                                                                       |
 | `order_by`          | string           | no         | Return issues ordered by `created_at` or `updated_at` fields. Default is `created_at`                                                               |
 | `sort`              | string           | no         | Return issues sorted in `asc` or `desc` order. Default is `desc`                                                                                    |
@@ -153,12 +156,15 @@ GET /groups/:id/issues?my_reaction_emoji=star
 | `state`             | string           | no         | Return all issues or just those that are `opened` or `closed`                                                                 |
 | `labels`            | string           | no         | Comma-separated list of label names, issues must have all labels to be returned. `No+Label` lists all issues with no labels   |
 | `iids[]`            | Array[integer]   | no         | Return only the issues having the given `iid`                                                                                 |
-| `milestone`         | string           | no         | The milestone title. `No+Milestone` lists all issues with no milestone                                                                                                           |
+| `milestone`         | string           | no         | The milestone title. `None` lists all issues with no milestone. `Any` lists all issues that have an assigned milestone.       |
 | `scope`             | string           | no         | Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`.<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13004] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
 | `author_id`         | integer          | no         | Return issues created by the given user `id` _([Introduced][ce-13004] in GitLab 9.5)_                                         |
 | `assignee_id`       | integer          | no         | Return issues assigned to the given user `id`. `None` returns unassigned issues. `Any` returns issues with an assignee. _([Introduced][ce-13004] in GitLab 9.5)_ |
 | `my_reaction_emoji` | string           | no         | Return issues reacted by the authenticated user by the given `emoji`. `None` returns issues not given a reaction. `Any` returns issues given at least one reaction. _([Introduced][ce-14016] in GitLab 10.0)_ |
+<<<<<<< HEAD
 | `weight`            | integer          | no         | Return issues with the specified `weight`. `None` returns issues with no weight assigned. `Any` returns issues with a weight assigned. |
+=======
+>>>>>>> upstream/master
 | `order_by`          | string           | no         | Return issues ordered by `created_at` or `updated_at` fields. Default is `created_at`                                         |
 | `sort`              | string           | no         | Return issues sorted in `asc` or `desc` order. Default is `desc`                                                              |
 | `search`            | string           | no         | Search group issues against their `title` and `description`                                                                   |
@@ -269,12 +275,15 @@ GET /projects/:id/issues?my_reaction_emoji=star
 | `iids[]`            | Array[integer]   | no         | Return only the milestone having the given `iid`                                                                              |
 | `state`             | string           | no         | Return all issues or just those that are `opened` or `closed`                                                                 |
 | `labels`            | string           | no         | Comma-separated list of label names, issues must have all labels to be returned. `No+Label` lists all issues with no labels   |
-| `milestone`         | string           | no         | The milestone title. `No+Milestone` lists all issues with no milestone                                                                                                           |
+| `milestone`         | string           | no         | The milestone title. `None` lists all issues with no milestone. `Any` lists all issues that have an assigned milestone.       |
 | `scope`             | string           | no         | Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`.<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13004] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
 | `author_id`         | integer          | no         | Return issues created by the given user `id` _([Introduced][ce-13004] in GitLab 9.5)_                                         |
 | `assignee_id`       | integer          | no         | Return issues assigned to the given user `id`. `None` returns unassigned issues. `Any` returns issues with an assignee. _([Introduced][ce-13004] in GitLab 9.5)_ |
 | `my_reaction_emoji` | string           | no         | Return issues reacted by the authenticated user by the given `emoji`. `None` returns issues not given a reaction. `Any` returns issues given at least one reaction. _([Introduced][ce-14016] in GitLab 10.0)_ |
+<<<<<<< HEAD
 | `weight`            | integer          | no         | Return issues with the specified `weight`. `None` returns issues with no weight assigned. `Any` returns issues with a weight assigned. |
+=======
+>>>>>>> upstream/master
 | `order_by`          | string           | no         | Return issues ordered by `created_at` or `updated_at` fields. Default is `created_at`                                         |
 | `sort`              | string           | no         | Return issues sorted in `asc` or `desc` order. Default is `desc`                                                              |
 | `search`            | string           | no         | Search project issues against their `title` and `description`                                                                 |

doc/api/merge_requests.md

@@ -33,7 +33,7 @@ Parameters:
 | `state`             | string   | no       | Return all merge requests or just those that are `opened`, `closed`, `locked`, or `merged`                             |
 | `order_by`          | string   | no       | Return requests ordered by `created_at` or `updated_at` fields. Default is `created_at`                                |
 | `sort`              | string   | no       | Return requests sorted in `asc` or `desc` order. Default is `desc`                                                     |
-| `milestone`         | string   | no       | Return merge requests for a specific milestone                                                                         |
+| `milestone`         | string   | no       | Return merge requests for a specific milestone. `None` returns merge requests with no milestone. `Any` returns merge requests that have an assigned milestone. |
 | `view`              | string   | no       | If `simple`, returns the `iid`, URL, title, description, and basic state of merge request                              |
 | `labels`            | string   | no       | Return merge requests matching a comma separated list of labels                                                        |
 | `created_after`     | datetime | no       | Return merge requests created on or after the given time                                                               |
@@ -158,7 +158,7 @@ Parameters:
 | `state`             | string         | no       | Return all merge requests or just those that are `opened`, `closed`, `locked`, or `merged`                                     |
 | `order_by`          | string         | no       | Return requests ordered by `created_at` or `updated_at` fields. Default is `created_at`                                        |
 | `sort`              | string         | no       | Return requests sorted in `asc` or `desc` order. Default is `desc`                                                             |
-| `milestone`         | string         | no       | Return merge requests for a specific milestone                                                                                 |
+| `milestone`         | string         | no       | Return merge requests for a specific milestone. `None` returns merge requests with no milestone. `Any` returns merge requests that have an assigned milestone. |
 | `view`              | string         | no       | If `simple`, returns the `iid`, URL, title, description, and basic state of merge request                                      |
 | `labels`            | string         | no       | Return merge requests matching a comma separated list of labels                                                                |
 | `created_after`     | datetime       | no       | Return merge requests created on or after the given time                                                                       |
@@ -272,7 +272,11 @@ Parameters:
 | `state`             | string         | no       | Return all merge requests or just those that are `opened`, `closed`, `locked`, or `merged`                                     |
 | `order_by`          | string         | no       | Return merge requests ordered by `created_at` or `updated_at` fields. Default is `created_at`                                  |
 | `sort`              | string         | no       | Return merge requests sorted in `asc` or `desc` order. Default is `desc`                                                       |
+<<<<<<< HEAD
 | `milestone`         | string         | no       | Return merge requests for a specific milestone                                                                                 |
+=======
+| `milestone`         | string         | no       | Return merge requests for a specific milestone. `None` returns merge requests with no milestone. `Any` returns merge requests that have an assigned milestone. |
+>>>>>>> upstream/master
 | `view`              | string         | no       | If `simple`, returns the `iid`, URL, title, description, and basic state of merge request                                      |
 | `labels`            | string         | no       | Return merge requests matching a comma separated list of labels                                                                |
 | `created_after`     | datetime       | no       | Return merge requests created on or after the given time                                                                       |

doc/ci/examples/artifactory_and_gitlab/index.md

@@ -16,8 +16,8 @@ to build a [Maven](https://maven.apache.org/) project, deploy it to [Artifactory
 
 You'll create two different projects:
 
-- `simple-maven-dep`: the app built and deployed to Artifactory (available at https://gitlab.com/gitlab-examples/maven/simple-maven-dep)
-- `simple-maven-app`: the app using the previous one as a dependency (available at https://gitlab.com/gitlab-examples/maven/simple-maven-app)
+- `simple-maven-dep`: the app built and deployed to Artifactory (available at https://gitlab.com/gitlab-examples/maven/simple-maven-dep )
+- `simple-maven-app`: the app using the previous one as a dependency (available at https://gitlab.com/gitlab-examples/maven/simple-maven-app )
 
 We assume that you already have a GitLab account on [GitLab.com](https://gitlab.com/), and that you know the basic usage of Git and [GitLab CI/CD](https://about.gitlab.com/features/gitlab-ci-cd/).
 We also assume that an Artifactory instance is available and reachable from the internet, and that you have valid credentials to deploy on it.

doc/development/api_graphql_styleguide.md

@@ -379,7 +379,7 @@ let(:mutation) do
   )
 end
 
-it 'returns a successfull response' do
+it 'returns a successful response' do
    post_graphql_mutation(mutation, current_user: user)
 
    expect(response).to have_gitlab_http_status(:success)

doc/development/ux_guide/tips.md

 # Tips
 
-## Contents
-* [SVGs](#svgs)
-
----
-
 ## SVGs
 
 When exporting SVGs, be sure to follow the following guidelines:
 
 1. Convert all strokes to outlines.
-2. Use pathfinder tools to combine overlapping paths and create compound paths.
-3. SVGs that are limited to one color should be exported without a fill color so the color can be set using CSS.
-4. Ensure that exported SVGs have been run through an [SVG cleaner](https://github.com/RazrFalcon/SVGCleaner) to remove unused elements and attributes.
+1. Use pathfinder tools to combine overlapping paths and create compound paths.
+1. SVGs that are limited to one color should be exported without a fill color so the color can be set using CSS.
+1. Ensure that exported SVGs have been run through an [SVG cleaner](https://github.com/RazrFalcon/SVGCleaner) to remove unused elements and attributes.
+
+You can open your SVG in a text editor to ensure that it is clean.
 
-You can open your svg in a text editor to ensure that it is clean.
 Incorrect files will look like this:
 
 ```xml
@@ -35,10 +31,10 @@ Incorrect files will look like this:
 </svg>
 ```
 
-Correct file will look like this:
+Correct files will look like this:
 
 ```xml
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 17" enable-background="new 0 0 16 17"><path d="m15.1 1h-2.1v-1h-2v1h-6v-1h-2v1h-2.1c-.5 0-.9.5-.9 1v14c0 .6.4 1 .9 1h14.2c.5 0 .9-.4.9-1v-14c0-.5-.4-1-.9-1m-1.1 14h-12v-9h12v9m0-11h-12v-1h12v1"/><path d="m5.4 11.6l1.5 1.2c.4.3 1.1.3 1.4-.1l2.5-3c.3-.4.3-1.1-.1-1.4-.5-.4-1.1-.3-1.5.1l-1.8 2.2-.8-.6c-.4-.3-1.1-.3-1.4.2-.3.4-.3 1 .2 1.4"/></svg>
 ```
 
-> TODO: Checkout [https://github.com/svg/svgo](https://github.com/svg/svgo)
+> TODO: Checkout <https://github.com/svg/svgo>.

doc/install/digitaloceandocker.md

 # Digital Ocean and Docker Machine test environment
 
-## Warning. This guide is for quickly testing different versions of GitLab and
-## not recommended for ease of future upgrades or keeping the data you create.
+CAUTION: **Caution:**
+This guide is for quickly testing different versions of GitLab and not recommended for ease of
+future upgrades or keeping the data you create.
 
 ## Initial setup
 
@@ -12,92 +13,88 @@ locally on either macOS or Linux.
 
 #### Install Docker Toolbox
 
-1. [https://www.docker.com/products/docker-toolbox](https://www.docker.com/products/docker-toolbox)
+- <https://www.docker.com/products/docker-toolbox>
 
 ### On Linux
 
 #### Install Docker Engine
 
-1. [https://docs.docker.com/engine/installation/linux](https://docs.docker.com/engine/installation/linux/)
+- <https://docs.docker.com/engine/installation/linux/>
 
 #### Install Docker Machine
 
-1. [https://docs.docker.com/machine/install-machine](https://docs.docker.com/machine/install-machine/)
+- <https://docs.docker.com/machine/install-machine/>
 
-_The rest of the steps are identical for macOS and Linux_
+NOTE: **Note:**
+The rest of the steps are identical for macOS and Linux.
 
 ### Create new docker host
 
-1. Login to Digital Ocean
-1. Generate a new API token at https://cloud.digitalocean.com/settings/api/tokens
+1. Login to Digital Ocean.
+1. Generate a new API token at <https://cloud.digitalocean.com/settings/api/tokens>.
 
+    This command will create a new DO droplet called `gitlab-test-env-do` that will act as a docker host.
 
-This command will create a new DO droplet called `gitlab-test-env-do` that will act as a docker host.
+    NOTE: **Note:**
+    4GB is the minimum requirement for a Docker host that will run more than one GitLab instance.
 
-**Note: 4GB is the minimum requirement for a Docker host that will run more then one GitLab instance**
+    - RAM: 4GB
+    - Name: `gitlab-test-env-do`
+    - Driver: `digitalocean`
 
-+ RAM: 4GB
-+ Name: `gitlab-test-env-do`
-+ Driver: `digitalocean`
+1. Set the DO token:
 
+    ```sh
+    export DOTOKEN=<your generated token>
+    ```
 
-**Set the DO token** - Replace the string below with your generated token
+1. Create the machine:
 
-```
-export DOTOKEN=cf3dfd0662933203005c4a73396214b7879d70aabc6352573fe178d340a80248
-```
-
-**Create the machine**
-
-```
-docker-machine create \
-  --driver digitalocean \
-  --digitalocean-access-token=$DOTOKEN \
-  --digitalocean-size "4gb" \
-    gitlab-test-env-do
-```
-
-+ Resource: https://docs.docker.com/machine/drivers/digital-ocean/
+    ```sh
+    docker-machine create \
+      --driver digitalocean \
+      --digitalocean-access-token=$DOTOKEN \
+      --digitalocean-size "4gb" \
+        gitlab-test-env-do
+    ```
 
+Resource: <https://docs.docker.com/machine/drivers/digital-ocean/>.
 
 ### Creating GitLab test instance
 
-
 #### Connect your shell to the new machine
 
-
 In this example we'll create a GitLab EE 8.10.8 instance.
 
-
 First connect the docker client to the docker host you created previously.
 
-```
+```sh
 eval "$(docker-machine env gitlab-test-env-do)"
 ```
 
 You can add this to your `~/.bash_profile` file to ensure the `docker` client uses the `gitlab-test-env-do` docker host
 
-
 #### Create new GitLab container
 
-+ HTTP port: `8888`
-+ SSH port: `2222`
-   + Set `gitlab_shell_ssh_port` using `--env GITLAB_OMNIBUS_CONFIG `
-+ Hostname: IP of docker host
-+ Container name: `gitlab-test-8.10`
-+ GitLab version: **EE** `8.10.8-ee.0`
+- HTTP port: `8888`
+- SSH port: `2222`
+  - Set `gitlab_shell_ssh_port` using `--env GITLAB_OMNIBUS_CONFIG`
+- Hostname: IP of docker host
+- Container name: `gitlab-test-8.10`
+- GitLab version: **EE** `8.10.8-ee.0`
 
-#####  Set up container settings
+##### Set up container settings
 
-```
+```sh
 export SSH_PORT=2222
 export HTTP_PORT=8888
 export VERSION=8.10.8-ee.0
 export NAME=gitlab-test-8.10
 ```
 
-#####  Create container
-```
+##### Create container
+
+```sh
 docker run --detach \
 --env GITLAB_OMNIBUS_CONFIG="external_url 'http://$(docker-machine ip gitlab-test-env-do):$HTTP_PORT'; gitlab_rails['gitlab_shell_ssh_port'] = $SSH_PORT;" \
 --hostname $(docker-machine ip gitlab-test-env-do) \
@@ -110,23 +107,20 @@ gitlab/gitlab-ee:$VERSION
 
 ##### Retrieve the docker host IP
 
-```
+```sh
 docker-machine ip gitlab-test-env-do
 # example output: 192.168.151.134
 ```
 
-
-+ Browse to: http://192.168.151.134:8888/
-
+Browse to: <http://192.168.151.134:8888/>.
 
 ##### Execute interactive shell/edit configuration
 
-
-```
+```sh
 docker exec -it $NAME /bin/bash
 ```
 
-```
+```sh
 # example commands
 root@192:/# vi /etc/gitlab/gitlab.rb
 root@192:/# gitlab-ctl reconfigure
@@ -134,6 +128,6 @@ root@192:/# gitlab-ctl reconfigure
 
 #### Resources
 
-+ [https://docs.gitlab.com/omnibus/docker/](https://docs.gitlab.com/omnibus/docker/)
-+ [https://docs.docker.com/machine/get-started/](https://docs.docker.com/machine/get-started/)
-+ [https://docs.docker.com/machine/reference/ip/](https://docs.docker.com/machine/reference/ip/)+
+- <https://docs.gitlab.com/omnibus/docker/>.
+- <https://docs.docker.com/machine/get-started/>.
+- <https://docs.docker.com/machine/reference/ip/>.

lib/extracts_path.rb

@@ -153,7 +153,7 @@ module ExtractsPath
 
   private
 
-  # overriden in subclasses, do not remove
+  # overridden in subclasses, do not remove
   def get_id
     id = [params[:id] || params[:ref]]
     id << "/" + params[:path] unless params[:path].blank?

lib/gitlab/auth/o_auth/auth_hash.rb

@@ -82,7 +82,7 @@ module Gitlab
         end
 
         # Get the first part of the email address (before @)
-        # In addtion in removes illegal characters
+        # In addition in removes illegal characters
         def generate_username(email)
           email.match(/^[^@]*/)[0].mb_chars.normalize(:kd).gsub(/[^\x00-\x7F]/, '').to_s
         end

lib/gitlab/background_migration/set_confidential_note_events_on_services.rb

@@ -3,8 +3,8 @@
 
 module Gitlab
   module BackgroundMigration
-    # Ensures services which previously recieved all notes events continue
-    # to recieve confidential ones.
+    # Ensures services which previously received all notes events continue
+    # to receive confidential ones.
     class SetConfidentialNoteEventsOnServices
       class Service < ActiveRecord::Base
         self.table_name = 'services'

lib/gitlab/background_migration/set_confidential_note_events_on_webhooks.rb

@@ -3,8 +3,8 @@
 
 module Gitlab
   module BackgroundMigration
-    # Ensures hooks which previously recieved all notes events continue
-    # to recieve confidential ones.
+    # Ensures hooks which previously received all notes events continue
+    # to receive confidential ones.
     class SetConfidentialNoteEventsOnWebhooks
       class WebHook < ActiveRecord::Base
         self.table_name = 'web_hooks'

lib/gitlab/ci/templates/Maven.gitlab-ci.yml

@@ -15,7 +15,7 @@
 # * Publishes the documentation for `master` branch.
 
 variables:
-  # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
+  # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
   # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
   MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
   # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used

lib/gitlab/database/migration_helpers.rb

@@ -879,7 +879,7 @@ module Gitlab
         columns(table).find { |column| column.name == name }
       end
 
-      # This will replace the first occurance of a string in a column with
+      # This will replace the first occurrence of a string in a column with
       # the replacement
       # On postgresql we can use `regexp_replace` for that.
       # On mysql we find the location of the pattern, and overwrite it

lib/gitlab/diff/position_tracer.rb

@@ -24,7 +24,7 @@ module Gitlab
         # head of `feature` was commit B, resulting in the original diff A->B.
         # Since creation, `master` was updated to C.
         # Now `feature` is being updated to D, and the newly generated MR diff is C->D.
-        # It is possible that C and D are direct decendants of A and B respectively,
+        # It is possible that C and D are direct descendants of A and B respectively,
         # but this isn't necessarily the case as rebases and merges come into play.
         #
         # Suppose we have a diff note on the original diff A->B. Now that the MR

lib/gitlab/gitaly_client/repository_service.rb

@@ -349,7 +349,7 @@ module Gitlab
             f.write(message.data)
           end
         end
-        # If the file is empty means that we recieved an empty stream, we delete the file
+        # If the file is empty means that we received an empty stream, we delete the file
         FileUtils.rm(save_path) if File.zero?(save_path)
       end
 

lib/gitlab/import/merge_request_helpers.rb

@@ -22,7 +22,7 @@ module Gitlab
           # additional work that is strictly necessary.
           merge_request_id = insert_and_return_id(attributes, project.merge_requests)
 
-          merge_request = project.merge_requests.find(merge_request_id)
+          merge_request = project.merge_requests.reload.find(merge_request_id)
 
           # We use .insert_and_return_id which effectively disables all callbacks.
           # Trigger iid logic here to make sure we track internal id values consistently.

lib/gitlab/import_export/project_tree_restorer.rb

@@ -154,7 +154,7 @@ module Gitlab
           Project.transaction do
             process_sub_relation(relation, relation_item)
 
-            # For every subrelation that hangs from Project, save the associated records alltogether
+            # For every subrelation that hangs from Project, save the associated records altogether
             # This effectively batches all records per subrelation item, only keeping those in memory
             # We have to keep in mind that more batch granularity << Memory, but >> Slowness
             if save

lib/gitlab/path_regex.rb

@@ -240,7 +240,7 @@ module Gitlab
 
     def single_line_regexp(regex)
       # Turns a multiline extended regexp into a single line one,
-      # beacuse `rake routes` breaks on multiline regexes.
+      # because `rake routes` breaks on multiline regexes.
       Regexp.new(regex.source.gsub(/\(\?#.+?\)/, '').gsub(/\s*/, ''), regex.options ^ Regexp::EXTENDED).freeze
     end
   end

lib/gitlab/proxy_http_connection_adapter.rb

@@ -4,7 +4,7 @@
 # of the global setting allow_local_requests_from_hooks_and_services this adapter
 # will allow/block connection to internal IPs and/or urls.
 #
-# This functionality can be overriden by providing the setting the option
+# This functionality can be overridden by providing the setting the option
 # allow_local_requests = true in the request. For example:
 # Gitlab::HTTP.get('http://www.gitlab.com', allow_local_requests: true)
 #

lib/gitlab/slash_commands/issue_new.rb

@@ -3,7 +3,7 @@ module Gitlab
     class IssueNew < IssueCommand
       def self.match(text)
         # we can not match \n with the dot by passing the m modifier as than
-        # the title and description are not seperated
+        # the title and description are not separated
         /\Aissue\s+(new|create)\s+(?<title>[^\n]*)\n*(?<description>(.|\n)*)/.match(text)
       end
 

lib/gitlab/user_extractor.rb

 # frozen_string_literal: true
 
 # This class extracts all users found in a piece of text by the username or the
-# email adress
+# email address
 
 module Gitlab
   class UserExtractor

lib/google_api/auth.rb

@@ -16,7 +16,7 @@ module GoogleApi
       client.auth_code.authorize_url(
         redirect_uri: redirect_uri,
         scope: scope,
-        state: state # This is used for arbitary redirection
+        state: state # This is used for arbitrary redirection
       )
     end
 

scripts/trigger-build

@@ -32,32 +32,32 @@ module Trigger
 
     private
 
-    # Must be overriden
+    # Must be overridden
     def downstream_project_path
       raise NotImplementedError
     end
 
-    # Must be overriden
+    # Must be overridden
     def ref
       raise NotImplementedError
     end
 
-    # Must be overriden
+    # Must be overridden
     def trigger_token
       raise NotImplementedError
     end
 
-    # Must be overriden
+    # Must be overridden
     def access_token
       raise NotImplementedError
     end
 
-    # Can be overriden
+    # Can be overridden
     def extra_variables
       {}
     end
 
-    # Can be overriden
+    # Can be overridden
     def version_param_value(version_file)
       File.read(version_file).strip
     end

spec/controllers/groups/milestones_controller_spec.rb

@@ -63,7 +63,7 @@ describe Groups::MilestonesController do
     let(:group_milestone) { create(:milestone, group: group) }
 
     context 'when there is a title parameter' do
-      it 'searchs for a legacy group milestone' do
+      it 'searches for a legacy group milestone' do
         expect(GlobalMilestone).to receive(:build)
         expect(Milestone).not_to receive(:find_by_iid)
 
@@ -72,7 +72,7 @@ describe Groups::MilestonesController do
     end
 
     context 'when there is not a title parameter' do
-      it 'searchs for a group milestone' do
+      it 'searches for a group milestone' do
         expect(GlobalMilestone).not_to receive(:build)
         expect(Milestone).to receive(:find_by_iid)
 

spec/controllers/groups_controller_spec.rb

@@ -568,7 +568,7 @@ describe GroupsController do
       sign_in(user)
     end
 
-    context 'when transfering to a subgroup goes right' do
+    context 'when transferring to a subgroup goes right' do
       let(:new_parent_group) { create(:group, :public) }
       let!(:group_member) { create(:group_member, :owner, group: group, user: user) }
       let!(:new_parent_group_member) { create(:group_member, :owner, group: new_parent_group, user: user) }

spec/controllers/profiles/keys_controller_spec.rb

@@ -4,7 +4,7 @@ describe Profiles::KeysController do
   let(:user) { create(:user) }
 
   describe "#get_keys" do
-    describe "non existant user" do
+    describe "non existent user" do
       it "does not generally work" do
         get :get_keys, username: 'not-existent'
 

spec/controllers/projects/environments_controller_spec.rb

@@ -216,7 +216,7 @@ describe Projects::EnvironmentsController do
         expect(response).to have_gitlab_http_status(200)
       end
 
-      it 'loads the terminals for the enviroment' do
+      it 'loads the terminals for the environment' do
         expect_any_instance_of(Environment).to receive(:terminals)
 
         get :terminal, environment_params

spec/controllers/projects/merge_requests_controller_spec.rb

@@ -786,7 +786,7 @@ describe Projects::MergeRequestsController do
             merge_request.mark_as_merged!
           end
 
-          it 'returns the enviroment on the source project' do
+          it 'returns the environment on the source project' do
             get_ci_environments_status(environment_target: 'merge_commit')
 
             expect(response).to have_gitlab_http_status(:ok)

spec/features/dashboard/archived_projects_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe 'Dashboard Archived Project' do
     expect(page).not_to have_content(project.name)
   end
 
-  it 'searchs archived projects', :js do
+  it 'searches archived projects', :js do
     click_button 'Last updated'
     click_link 'Show archived projects'
 

spec/features/import/manifest_import_spec.rb

@@ -22,7 +22,7 @@ describe 'Import multiple repositories by uploading a manifest file', :js, :post
     expect(page).to have_content('https://android-review.googlesource.com/platform/build/blueprint')
   end
 
-  it 'imports succesfully imports a project' do
+  it 'imports successfully imports a project' do
     visit new_import_manifest_path
 
     attach_file('manifest', Rails.root.join('spec/fixtures/aosp_manifest.xml'))

spec/features/issues/gfm_autocomplete_spec.rb

@@ -15,7 +15,7 @@ describe 'GFM autocomplete', :js do
     wait_for_requests
   end
 
-  it 'updates issue descripton with GFM reference' do
+  it 'updates issue description with GFM reference' do
     find('.js-issuable-edit').click
 
     simulate_input('#issue-description', "@#{user.name[0...3]}")

spec/features/projects/badges/pipeline_badge_spec.rb

@@ -19,7 +19,7 @@ describe 'Pipeline Badge' do
     let!(:pipeline) { create(:ci_empty_pipeline, project: project, ref: ref, sha: project.commit(ref).sha) }
     let!(:job) { create(:ci_build, pipeline: pipeline) }
 
-    context 'when the pipeline was successfull' do
+    context 'when the pipeline was successful' do
       it 'displays so on the badge' do
         job.success
 

spec/features/projects/clusters_spec.rb

@@ -40,7 +40,7 @@ describe 'Clusters', :js do
         expect(page).to have_selector('.js-project-feature-toggle')
       end
 
-      context 'with sucessfull request' do
+      context 'with successful request' do
         it 'user sees updated cluster' do
           expect do
             page.find('.js-project-feature-toggle').click

spec/features/projects/files/user_creates_files_spec.rb

@@ -16,7 +16,7 @@ describe 'Projects > Files > User creates files' do
     sign_in(user)
   end
 
-  context 'without commiting a new file' do
+  context 'without committing a new file' do
     context 'when an user has write access' do
       before do
         visit(project_tree_path_root_ref)
@@ -49,7 +49,7 @@ describe 'Projects > Files > User creates files' do
     end
   end
 
-  context 'with commiting a new file' do
+  context 'with committing a new file' do
     context 'when an user has write access' do
       before do
         visit(project_tree_path_root_ref)

spec/finders/issues_finder_spec.rb

@@ -190,19 +190,31 @@ describe IssuesFinder do
       end
 
       context 'filtering by no milestone' do
-        let(:params) { { milestone_title: Milestone::None.title } }
+        let(:params) { { milestone_title: 'None' } }
 
         it 'returns issues with no milestone' do
           expect(issues).to contain_exactly(issue2, issue3, issue4)
         end
+
+        it 'returns issues with no milestone (deprecated)' do
+          params[:milestone_title] = Milestone::None.title
+
+          expect(issues).to contain_exactly(issue2, issue3, issue4)
+        end
       end
 
       context 'filtering by any milestone' do
-        let(:params) { { milestone_title: Milestone::Any.title } }
+        let(:params) { { milestone_title: 'Any' } }
 
         it 'returns issues with any assigned milestone' do
           expect(issues).to contain_exactly(issue1)
         end
+
+        it 'returns issues with any assigned milestone (deprecated)' do
+          params[:milestone_title] = Milestone::Any.title
+
+          expect(issues).to contain_exactly(issue1)
+        end
       end
 
       context 'filtering by upcoming milestone' do

spec/javascripts/awards_handler_spec.js

@@ -219,7 +219,7 @@ describe('AwardsHandler', function() {
       expect($thumbsUpEmoji.data('originalTitle')).toBe('You, sam, jerry, max, and andy');
     });
 
-    it('handles the special case where "You" is not cleanly comma seperated', function() {
+    it('handles the special case where "You" is not cleanly comma separated', function() {
       const awardUrl = awardsHandler.getAwardUrl();
       const $votesBlock = $('.js-awards-block').eq(0);
       const $thumbsUpEmoji = $votesBlock.find('[data-name=thumbsup]').parent();
@@ -244,7 +244,7 @@ describe('AwardsHandler', function() {
       expect($thumbsUpEmoji.data('originalTitle')).toBe('sam, jerry, max, and andy');
     });
 
-    it('handles the special case where "You" is not cleanly comma seperated', function() {
+    it('handles the special case where "You" is not cleanly comma separated', function() {
       const awardUrl = awardsHandler.getAwardUrl();
       const $votesBlock = $('.js-awards-block').eq(0);
       const $thumbsUpEmoji = $votesBlock.find('[data-name=thumbsup]').parent();

spec/javascripts/commit/commit_pipeline_status_component_spec.js

@@ -22,7 +22,7 @@ describe('Commit pipeline status component', () => {
     Component = Vue.extend(commitPipelineStatus);
   });
 
-  describe('While polling pipeline data succesfully', () => {
+  describe('While polling pipeline data successfully', () => {
     beforeEach(() => {
       mock = new MockAdapter(axios);
       mock.onGet('/dummy/endpoint').reply(() => {
@@ -59,14 +59,14 @@ describe('Commit pipeline status component', () => {
       });
     });
 
-    it('contains a ciStatus when the polling is succesful ', done => {
+    it('contains a ciStatus when the polling is successful ', done => {
       setTimeout(() => {
         expect(vm.ciStatus).toEqual(mockCiStatus);
         done();
       });
     });
 
-    it('contains a ci-status icon when polling is succesful', done => {
+    it('contains a ci-status icon when polling is successful', done => {
       setTimeout(() => {
         expect(vm.$el.querySelector('.ci-status-icon')).not.toBe(null);
         expect(vm.$el.querySelector('.ci-status-icon').classList).toContain(
@@ -77,7 +77,7 @@ describe('Commit pipeline status component', () => {
     });
   });
 
-  describe('When polling data was not succesful', () => {
+  describe('When polling data was not successful', () => {
     beforeEach(() => {
       mock = new MockAdapter(axios);
       mock.onGet('/dummy/endpoint').reply(502, {});

spec/javascripts/environments/environments_app_spec.js

@@ -31,7 +31,7 @@ describe('Environment', () => {
     mock.restore();
   });
 
-  describe('successfull request', () => {
+  describe('successful request', () => {
     describe('without environments', () => {
       beforeEach(done => {
         mock.onGet(mockData.endpoint).reply(200, { environments: [] });

spec/javascripts/environments/folder/environments_folder_view_spec.js

@@ -30,7 +30,7 @@ describe('Environments Folder View', () => {
     component.$destroy();
   });
 
-  describe('successfull request', () => {
+  describe('successful request', () => {
     beforeEach(() => {
       mock.onGet(mockData.endpoint).reply(
         200,

spec/javascripts/jobs/components/job_app_spec.js

@@ -52,7 +52,7 @@ describe('Job App ', () => {
     });
   });
 
-  describe('with successfull request', () => {
+  describe('with successful request', () => {
     beforeEach(() => {
       mock.onGet(`${props.pagePath}/trace.json`).replyOnce(200, {});
     });

spec/javascripts/lib/utils/datetime_utility_spec.js

@@ -199,11 +199,11 @@ describe('datefix', () => {
       expect(datetimeUtility.pad(2)).toEqual('02');
     });
 
-    it('should not add a zero when lenght matches the default', () => {
+    it('should not add a zero when length matches the default', () => {
       expect(datetimeUtility.pad(12)).toEqual('12');
     });
 
-    it('should add a 0 when lenght is smaller than the provided', () => {
+    it('should add a 0 when length is smaller than the provided', () => {
       expect(datetimeUtility.pad(12, 3)).toEqual('012');
     });
   });

spec/javascripts/lib/utils/text_utility_spec.js

@@ -118,7 +118,7 @@ describe('text_utility', () => {
   });
 
   describe('getFirstCharacterCapitalized', () => {
-    it('returns the first character captialized, if first character is alphabetic', () => {
+    it('returns the first character capitalized, if first character is alphabetic', () => {
       expect(textUtils.getFirstCharacterCapitalized('loremIpsumDolar')).toEqual('L');
       expect(textUtils.getFirstCharacterCapitalized('Sit amit !')).toEqual('S');
     });

spec/javascripts/notes/stores/mutation_spec.js

@@ -78,7 +78,7 @@ describe('Notes Store mutations', () => {
   });
 
   describe('COLLAPSE_DISCUSSION', () => {
-    it('should collpase an expanded discussion', () => {
+    it('should collapse an expanded discussion', () => {
       const discussion = Object.assign({}, discussionMock, { expanded: true });
 
       const state = {

spec/javascripts/pipelines/empty_state_spec.js

@@ -24,7 +24,7 @@ describe('Pipelines Empty State', () => {
     expect(component.$el.querySelector('.svg-content svg')).toBeDefined();
   });
 
-  it('should render emtpy state information', () => {
+  it('should render empty state information', () => {
     expect(component.$el.querySelector('h4').textContent).toContain('Build with confidence');
 
     expect(

spec/javascripts/pipelines/graph/action_component_spec.js

@@ -50,7 +50,7 @@ describe('pipeline graph action component', () => {
   });
 
   describe('on click', () => {
-    it('emits `pipelineActionRequestComplete` after a successfull request', done => {
+    it('emits `pipelineActionRequestComplete` after a successful request', done => {
       spyOn(component, '$emit');
 
       component.$el.click();

spec/javascripts/pipelines/pipelines_spec.js

@@ -372,7 +372,7 @@ describe('Pipelines', () => {
     });
   });
 
-  describe('successfull request', () => {
+  describe('successful request', () => {
     describe('with pipelines', () => {
       beforeEach(() => {
         mock.onGet('twitter/flight/pipelines.json').reply(200, pipelines);
@@ -667,7 +667,7 @@ describe('Pipelines', () => {
         });
       });
 
-      it('returns false when state is emtpy state', done => {
+      it('returns false when state is empty state', done => {
         vm.isLoading = false;
         vm.hasMadeRequest = true;
         vm.hasGitlabCi = false;

spec/javascripts/pipelines/stage_spec.js

@@ -40,7 +40,7 @@ describe('Pipelines stage component', () => {
     expect(component.$el.querySelector('button').getAttribute('data-toggle')).toEqual('dropdown');
   });
 
-  describe('with successfull request', () => {
+  describe('with successful request', () => {
     beforeEach(() => {
       mock.onGet('path.json').reply(200, stageReply);
     });

spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js

@@ -69,7 +69,7 @@ describe('MRWidgetMerged', () => {
         expect(vm.shouldShowRemoveSourceBranch).toEqual(true);
       });
 
-      it('returns false wehn sourceBranchRemoved is true', () => {
+      it('returns false when sourceBranchRemoved is true', () => {
         vm.mr.sourceBranchRemoved = true;
 
         expect(vm.shouldShowRemoveSourceBranch).toEqual(false);

spec/javascripts/vue_shared/components/filtered_search_dropdown_spec.js

@@ -41,7 +41,7 @@ describe('Filtered search dropdown', () => {
     });
   });
 
-  describe('when visible number is bigger than the items lenght', () => {
+  describe('when visible number is bigger than the items length', () => {
     beforeEach(() => {
       vm = mountComponent(Component, {
         items: [{ title: 'One' }, { title: 'Two' }, { title: 'Three' }],

spec/javascripts/vue_shared/components/user_avatar/user_avatar_link_spec.js

@@ -44,7 +44,7 @@ describe('User Avatar Link Component', function() {
     expect(this.userAvatarLink.$el.querySelector('img')).not.toBeNull();
   });
 
-  it('should return neccessary props as defined', function() {
+  it('should return necessary props as defined', function() {
     _.each(this.propsData, (val, key) => {
       expect(this.userAvatarLink[key]).toBeDefined();
     });

spec/lib/banzai/filter/autolink_filter_spec.rb

@@ -76,7 +76,7 @@ describe Banzai::Filter::AutolinkFilter do
       expect(doc.at_css('a')['href']).to eq link
     end
 
-    it 'autolinks multiple occurences of smb' do
+    it 'autolinks multiple occurrences of smb' do
       link1 = 'smb:///Volumes/shared/foo.pdf'
       link2 = 'smb:///Volumes/shared/bar.pdf'
 

spec/lib/banzai/filter/relative_link_filter_spec.rb

@@ -226,7 +226,7 @@ describe Banzai::Filter::RelativeLinkFilter do
       let(:ref) {'mark#\'@],+;-._/#@!$&()+down'}
 
       it 'correctly escapes the ref' do
-        # Adressable won't escape the '#', so we do this manually
+        # Addressable won't escape the '#', so we do this manually
         ref_escaped = 'mark%23\'@%5D,+;-._/%23@!$&()+down'
 
         # Stub this method so the branch doesn't actually need to be in the repo

spec/lib/container_registry/blob_spec.rb

@@ -64,7 +64,7 @@ describe ContainerRegistry::Blob do
         .to_return(status: 200)
     end
 
-    it 'returns true when blob has been successfuly deleted' do
+    it 'returns true when blob has been successfully deleted' do
       expect(blob.delete).to be_truthy
     end
   end

spec/lib/gitlab/background_migration/create_fork_network_memberships_range_spec.rb

@@ -118,7 +118,7 @@ describe Gitlab::BackgroundMigration::CreateForkNetworkMembershipsRange, :migrat
       expect(fork_network_members.count).to eq(12)
     end
 
-    it 'knows when not all memberships withing a batch have been created' do
+    it 'knows when not all memberships within a batch have been created' do
       expect(migration.missing_members?(8, 10)).to be_truthy
     end
   end

spec/lib/gitlab/checks/lfs_integrity_spec.rb

@@ -68,7 +68,7 @@ describe Gitlab::Checks::LfsIntegrity do
         expect(subject.objects_missing?).to be_truthy
       end
 
-      it 'is false parent project already conatins LFS objects for the fork' do
+      it 'is false parent project already contains LFS objects for the fork' do
         lfs_object = create(:lfs_object, oid: blob_object.lfs_oid)
         create(:lfs_objects_project, project: parent_project, lfs_object: lfs_object)
 

spec/lib/gitlab/ci/ansi2html_spec.rb

@@ -7,7 +7,7 @@ describe Gitlab::Ci::Ansi2html do
     expect(convert_html("Hello")).to eq('Hello')
   end
 
-  it "strips non-color-changing controll sequences" do
+  it "strips non-color-changing control sequences" do
     expect(convert_html("Hello \e[2Kworld")).to eq('Hello world')
   end
 

spec/lib/gitlab/ci/build/policy/variables_spec.rb

@@ -24,7 +24,7 @@ describe Gitlab::Ci::Build::Policy::Variables do
       expect(policy).to be_satisfied_by(pipeline, seed)
     end
 
-    it 'is not satisfied by an overriden empty variable' do
+    it 'is not satisfied by an overridden empty variable' do
       policy = described_class.new(['$CI_PROJECT_NAME'])
 
       expect(policy).not_to be_satisfied_by(pipeline, seed)

spec/lib/gitlab/ci/config/entry/global_spec.rb

@@ -219,7 +219,7 @@ describe Gitlab::Ci::Config::Entry::Global do
 
     ##
     # When nodes are specified but not defined, we assume that
-    # configuration is valid, and we asume that entry is simply undefined,
+    # configuration is valid, and we assume that entry is simply undefined,
     # despite the fact, that key is present. See issue #18775 for more
     # details.
     #

spec/lib/gitlab/cross_project_access/check_info_spec.rb

@@ -50,7 +50,7 @@ describe Gitlab::CrossProjectAccess::CheckInfo do
       expect(info.should_run?(dummy_controller)).to be_truthy
     end
 
-    it 'returns the the oposite of #should_skip? when the check is a skip' do
+    it 'returns the the opposite of #should_skip? when the check is a skip' do
       info = described_class.new({}, nil, nil, true)
 
       expect(info).to receive(:should_skip?).with(dummy_controller).and_return(false)
@@ -101,7 +101,7 @@ describe Gitlab::CrossProjectAccess::CheckInfo do
       expect(info.should_skip?(dummy_controller)).to be_truthy
     end
 
-    it 'returns the the oposite of #should_run? when the check is not a skip' do
+    it 'returns the the opposite of #should_run? when the check is not a skip' do
       info = described_class.new({}, nil, nil, false)
 
       expect(info).to receive(:should_run?).with(dummy_controller).and_return(false)