Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-11-22

Signed-off-by: Rémy Coutable <remy@rymai.me>

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

@@ -48,13 +48,32 @@
 
     created() {
       eventHub.$on('toggleFolder', this.toggleFolder);
+<<<<<<< HEAD
+=======
+      eventHub.$on('toggleDeployBoard', this.toggleDeployBoard);
+>>>>>>> origin/master
     },
 
     beforeDestroy() {
       eventHub.$off('toggleFolder');
+<<<<<<< HEAD
     },
 
     methods: {
+=======
+      eventHub.$off('toggleDeployBoard');
+    },
+
+    methods: {
+      /**
+       * Toggles the visibility of the deploy boards of the clicked environment.
+       * @param {Object} model
+       */
+      toggleDeployBoard(model) {
+        this.store.toggleDeployBoard(model.id);
+      },
+
+>>>>>>> origin/master
       toggleFolder(folder) {
         this.store.toggleFolder(folder);
 

app/assets/javascripts/environments/mixins/environments_mixin.js

@@ -21,7 +21,10 @@ import tabs from '../../vue_shared/components/navigation_tabs.vue';
 import container from '../components/container.vue';
 
 export default {
+<<<<<<< HEAD
 
+=======
+>>>>>>> origin/master
   components: {
     environmentTable,
     container,
@@ -58,7 +61,10 @@ export default {
         }
       });
     },
+<<<<<<< HEAD
 
+=======
+>>>>>>> origin/master
     /**
      * Handles URL and query parameter changes.
      * When the user uses the pagination or the tabs,

app/assets/javascripts/environments/stores/environments_store.js

@@ -44,12 +44,21 @@ export default class EnvironmentsStore {
   storeEnvironments(environments = []) {
     const filteredEnvironments = environments.map((env) => {
       const oldEnvironmentState = this.state.environments
+<<<<<<< HEAD
       .find((element) => {
         if (env.latest) {
           return element.id === env.latest.id;
         }
         return element.id === env.id;
       }) || {};
+=======
+        .find((element) => {
+          if (env.latest) {
+            return element.id === env.latest.id;
+          }
+          return element.id === env.id;
+        }) || {};
+>>>>>>> origin/master
 
       let filtered = {};
 

app/assets/javascripts/pipelines/components/pipelines.vue

@@ -171,7 +171,10 @@
        */
       updateContent(parameters) {
         this.updateInternalState(parameters);
+<<<<<<< HEAD
 
+=======
+>>>>>>> origin/master
         // fetch new data
         return this.service.getPipelines(this.requestData)
           .then((response) => {

app/assets/javascripts/render_gfm.js

 import renderMath from './render_math';
+<<<<<<< HEAD
 import renderMermaid from './render_mermaid';
+=======
+>>>>>>> origin/master
 
 // Render Gitlab flavoured Markdown
 //
@@ -8,7 +11,10 @@ import renderMermaid from './render_mermaid';
 $.fn.renderGFM = function renderGFM() {
   this.find('.js-syntax-highlight').syntaxHighlight();
   renderMath(this.find('.js-render-math'));
+<<<<<<< HEAD
   renderMermaid(this.find('.js-render-mermaid'));
+=======
+>>>>>>> origin/master
   return this;
 };
 

app/controllers/application_controller.rb

@@ -204,7 +204,12 @@ class ApplicationController < ActionController::Base
   end
 
   def check_password_expiration
+<<<<<<< HEAD
     return if session[:impersonator_id] || !current_user&.allow_password_authentication?
+=======
+    return if session[:impersonator_id]
+    return unless current_user&.allow_password_authentication?
+>>>>>>> origin/master
 
     password_expires_at = current_user&.password_expires_at
 

app/models/namespace.rb

@@ -213,6 +213,10 @@ class Namespace < ActiveRecord::Base
     parent.present?
   end
 
+  def root_ancestor
+    ancestors.reorder(nil).find_by(parent_id: nil)
+  end
+
   def subgroup?
     has_parent?
   end

app/models/project.rb

@@ -500,6 +500,14 @@ class Project < ActiveRecord::Base
       .base_and_ancestors(upto: top)
   end
 
+  def root_namespace
+    if namespace.has_parent?
+      namespace.root_ancestor
+    else
+      namespace
+    end
+  end
+
   def lfs_enabled?
     return namespace.lfs_enabled? if self[:lfs_enabled].nil?
 

app/views/admin/groups/_form.html.haml

@@ -20,6 +20,7 @@
 
   = render 'groups/group_admin_settings', f: f
 
+  - if @group.shared_runner_minutes_supported?
     = render 'namespaces/shared_runners_minutes_setting', f: f
 
   - if @group.new_record?

app/views/projects/environments/folder.html.haml

@@ -10,3 +10,4 @@
   "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s,
   "can-read-environment" => can?(current_user, :read_environment, @project).to_s,
   "css-class" => container_class } }
+

changelogs/unreleased-ee/account-shared-minutes-on-top-level-namespace.yml

+---
+title: Account shared runner minutes to top-level namespace
+merge_request:
+author:
+type: fixed

changelogs/unreleased-ee/jej-protected-branch-api-includes-user-ids.yml

+---
+title: EE Protected Branches API access levels include user_id/group_id where relevant
+merge_request: 3535
+author:
+type: changed

db/schema.rb

@@ -32,9 +32,9 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.text "description", null: false
     t.string "logo"
     t.integer "updated_by"
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
     t.string "header_logo"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "description_html"
     t.integer "cached_markdown_version"
   end
@@ -307,8 +307,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
 
   create_table "ci_build_trace_sections", force: :cascade do |t|
     t.integer "project_id", null: false
-    t.datetime_with_timezone "date_start", null: false
-    t.datetime_with_timezone "date_end", null: false
+    t.datetime "date_start", null: false
+    t.datetime "date_end", null: false
     t.integer "byte_start", limit: 8, null: false
     t.integer "byte_end", limit: 8, null: false
     t.integer "build_id", null: false
@@ -387,8 +387,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.string "encrypted_value_iv"
     t.integer "group_id", null: false
     t.boolean "protected", default: false, null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   add_index "ci_group_variables", ["group_id", "key"], name: "index_ci_group_variables_on_group_id_and_key", unique: true, using: :btree
@@ -400,8 +400,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.string "encrypted_value_salt"
     t.string "encrypted_value_iv"
     t.integer "pipeline_schedule_id", null: false
-    t.datetime_with_timezone "created_at"
-    t.datetime_with_timezone "updated_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "ci_pipeline_schedule_variables", ["pipeline_schedule_id", "key"], name: "index_ci_pipeline_schedule_variables_on_schedule_id_and_key", unique: true, using: :btree
@@ -453,8 +453,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.integer "auto_canceled_by_id"
     t.integer "pipeline_schedule_id"
     t.integer "source"
-    t.boolean "protected"
     t.integer "config_source"
+    t.boolean "protected"
     t.integer "failure_reason"
   end
 
@@ -565,8 +565,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
 
   create_table "cluster_platforms_kubernetes", force: :cascade do |t|
     t.integer "cluster_id", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "api_url"
     t.text "ca_cert"
     t.string "namespace"
@@ -582,8 +582,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
   create_table "cluster_projects", force: :cascade do |t|
     t.integer "project_id", null: false
     t.integer "cluster_id", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   add_index "cluster_projects", ["cluster_id"], name: "index_cluster_projects_on_cluster_id", using: :btree
@@ -593,8 +593,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.integer "cluster_id", null: false
     t.integer "status"
     t.integer "num_nodes", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "status_reason"
     t.string "gcp_project_id", null: false
     t.string "zone", null: false
@@ -611,8 +611,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.integer "user_id"
     t.integer "provider_type"
     t.integer "platform_type"
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "enabled", default: true
     t.string "name", null: false
     t.string "environment_scope", default: "*", null: false
@@ -623,8 +623,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
 
   create_table "clusters_applications_helm", force: :cascade do |t|
     t.integer "cluster_id", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "status", null: false
     t.string "version", null: false
     t.text "status_reason"
@@ -632,8 +632,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
 
   create_table "clusters_applications_ingress", force: :cascade do |t|
     t.integer "cluster_id", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "status", null: false
     t.integer "ingress_type", null: false
     t.string "version", null: false
@@ -721,8 +721,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string "confirmation_token"
-    t.datetime_with_timezone "confirmed_at"
-    t.datetime_with_timezone "confirmation_sent_at"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
   end
 
   add_index "emails", ["confirmation_token"], name: "index_emails_on_confirmation_token", unique: true, using: :btree
@@ -753,8 +753,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
 
   create_table "epic_metrics", force: :cascade do |t|
     t.integer "epic_id", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   add_index "epic_metrics", ["epic_id"], name: "index_epic_metrics", using: :btree
@@ -771,9 +771,9 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.integer "lock_version"
     t.date "start_date"
     t.date "end_date"
-    t.datetime_with_timezone "last_edited_at"
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "last_edited_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "title", null: false
     t.string "title_html", null: false
     t.text "description"
@@ -790,8 +790,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.integer "project_id"
     t.integer "author_id", null: false
     t.integer "target_id"
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "action", limit: 2, null: false
     t.string "target_type"
   end
@@ -850,8 +850,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.integer "service_id"
     t.integer "status"
     t.integer "gcp_cluster_size", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "enabled", default: true
     t.text "status_reason"
     t.string "project_namespace"
@@ -915,8 +915,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
   create_table "geo_node_namespace_links", force: :cascade do |t|
     t.integer "geo_node_id", null: false
     t.integer "namespace_id", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   add_index "geo_node_namespace_links", ["geo_node_id", "namespace_id"], name: "index_geo_node_namespace_links_on_geo_node_id_and_namespace_id", unique: true, using: :btree
@@ -935,12 +935,12 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.integer "attachments_synced_count"
     t.integer "attachments_failed_count"
     t.integer "last_event_id"
-    t.datetime_with_timezone "last_event_date"
+    t.datetime "last_event_date"
     t.integer "cursor_last_event_id"
-    t.datetime_with_timezone "cursor_last_event_date"
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
-    t.datetime_with_timezone "last_successful_status_check_at"
+    t.datetime "cursor_last_event_date"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "last_successful_status_check_at"
     t.string "status_message"
   end
 
@@ -1034,8 +1034,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
   add_index "gpg_key_subkeys", ["keyid"], name: "index_gpg_key_subkeys_on_keyid", unique: true, using: :btree
 
   create_table "gpg_keys", force: :cascade do |t|
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "user_id"
     t.binary "primary_keyid"
     t.binary "fingerprint"
@@ -1047,8 +1047,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
   add_index "gpg_keys", ["user_id"], name: "index_gpg_keys_on_user_id", using: :btree
 
   create_table "gpg_signatures", force: :cascade do |t|
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "project_id"
     t.integer "gpg_key_id"
     t.binary "commit_sha"
@@ -1066,8 +1066,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
   add_index "gpg_signatures", ["project_id"], name: "index_gpg_signatures_on_project_id", using: :btree
 
   create_table "group_custom_attributes", force: :cascade do |t|
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "group_id", null: false
     t.string "key", null: false
     t.string "value", null: false
@@ -1162,7 +1162,7 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.datetime "last_edited_at"
     t.integer "last_edited_by_id"
     t.boolean "discussion_locked"
-    t.datetime_with_timezone "closed_at"
+    t.datetime "closed_at"
   end
 
   add_index "issues", ["assignee_id"], name: "index_issues_on_assignee_id", using: :btree
@@ -1313,8 +1313,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
   add_index "members", ["user_id"], name: "index_members_on_user_id", using: :btree
 
   create_table "merge_request_diff_commits", id: false, force: :cascade do |t|
-    t.datetime_with_timezone "authored_date"
-    t.datetime_with_timezone "committed_date"
+    t.datetime "authored_date"
+    t.datetime "committed_date"
     t.integer "merge_request_diff_id", null: false
     t.integer "relative_order", null: false
     t.binary "sha", null: false
@@ -1667,8 +1667,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
   add_index "personal_access_tokens", ["user_id"], name: "index_personal_access_tokens_on_user_id", using: :btree
 
   create_table "plans", force: :cascade do |t|
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "name"
     t.string "title"
     t.integer "active_pipelines_limit"
@@ -1688,8 +1688,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
 
   create_table "project_auto_devops", force: :cascade do |t|
     t.integer "project_id", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "enabled"
     t.string "domain"
   end
@@ -1697,8 +1697,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
   add_index "project_auto_devops", ["project_id"], name: "index_project_auto_devops_on_project_id", unique: true, using: :btree
 
   create_table "project_custom_attributes", force: :cascade do |t|
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "project_id", null: false
     t.string "key", null: false
     t.string "value", null: false
@@ -1748,9 +1748,9 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.integer "retry_count", default: 0, null: false
     t.datetime "last_update_started_at"
     t.datetime "last_update_scheduled_at"
-    t.datetime_with_timezone "next_execution_timestamp"
-    t.datetime_with_timezone "created_at"
-    t.datetime_with_timezone "updated_at"
+    t.datetime "next_execution_timestamp"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "project_mirror_data", ["next_execution_timestamp", "retry_count"], name: "index_mirror_data_on_next_execution_and_retry_count", using: :btree
@@ -1787,12 +1787,12 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.string "import_status"
     t.text "merge_requests_template"
     t.integer "star_count", default: 0, null: false
-    t.boolean "merge_requests_rebase_enabled", default: false, null: false
+    t.boolean "merge_requests_rebase_enabled", default: false
     t.string "import_type"
     t.string "import_source"
     t.integer "approvals_before_merge", default: 0, null: false
     t.boolean "reset_approvals_on_push", default: true
-    t.boolean "merge_requests_ff_only_enabled", default: false, null: false
+    t.boolean "merge_requests_ff_only_enabled", default: false
     t.text "issues_template"
     t.boolean "mirror", default: false, null: false
     t.datetime "mirror_last_update_at"
@@ -2047,8 +2047,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.string "team_name", null: false
     t.string "alias", null: false
     t.string "user_id", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   add_index "slack_integrations", ["service_id"], name: "index_slack_integrations_on_service_id", using: :btree
@@ -2141,7 +2141,7 @@ ActiveRecord::Schema.define(version: 20171121144800) do
     t.datetime "updated_at", null: false
     t.integer "issue_id"
     t.integer "merge_request_id"
-    t.datetime_with_timezone "spent_at"
+    t.datetime "spent_at"
   end
 
   add_index "timelogs", ["issue_id"], name: "index_timelogs_on_issue_id", using: :btree
@@ -2216,8 +2216,8 @@ ActiveRecord::Schema.define(version: 20171121144800) do
   add_index "user_agent_details", ["subject_id", "subject_type"], name: "index_user_agent_details_on_subject_id_and_subject_type", using: :btree
 
   create_table "user_custom_attributes", force: :cascade do |t|
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "user_id", null: false
     t.string "key", null: false
     t.string "value", null: false

doc/administration/high_availability/redis.md

@@ -571,8 +571,7 @@ or a failover promotes a different **Master** node.
 In `/etc/gitlab/gitlab.rb`:
 
 ```ruby
-redis_master_role['enable'] = true
-redis_sentinel_role['enable'] = true
+roles ['redis_sentinel_role', 'redis_master_role']
 redis['bind'] = '10.0.0.1'
 redis['port'] = 6379
 redis['password'] = 'redis-password-goes-here'
@@ -594,8 +593,7 @@ sentinel['quorum'] = 2
 In `/etc/gitlab/gitlab.rb`:
 
 ```ruby
-redis_slave_role['enable'] = true
-redis_sentinel_role['enable'] = true
+roles ['redis_sentinel_role', 'redis_slave_role']
 redis['bind'] = '10.0.0.2'
 redis['port'] = 6379
 redis['password'] = 'redis-password-goes-here'
@@ -617,8 +615,7 @@ sentinel['quorum'] = 2
 In `/etc/gitlab/gitlab.rb`:
 
 ```ruby
-redis_slave_role['enable'] = true
-redis_sentinel_role['enable'] = true
+roles ['redis_sentinel_role', 'redis_slave_role']
 redis['bind'] = '10.0.0.3'
 redis['port'] = 6379
 redis['password'] = 'redis-password-goes-here'

doc/api/protected_branches.md

@@ -36,13 +36,17 @@ Example response:
     "push_access_levels": [
       {
         "access_level": 40,
+        "user_id": null,
+        "group_id": null,
         "access_level_description": "Masters"
       }
     ],
     "merge_access_levels": [
       {
-        "access_level": 40,
-        "access_level_description": "Masters"
+        "access_level": null,
+        "user_id": null,
+        "group_id": 1234,
+        "access_level_description": "Example Merge Group"
       }
     ]
   },
@@ -75,13 +79,17 @@ Example response:
   "push_access_levels": [
     {
       "access_level": 40,
+      "user_id": null,
+      "group_id": null,
       "access_level_description": "Masters"
     }
   ],
   "merge_access_levels": [
     {
-      "access_level": 40,
-      "access_level_description": "Masters"
+      "access_level": null,
+      "user_id": null,
+      "group_id": 1234,
+      "access_level_description": "Example Merge Group"
     }
   ]
 }
@@ -115,12 +123,16 @@ Example response:
   "push_access_levels": [
     {
       "access_level": 30,
+      "user_id": null,
+      "group_id": null,
       "access_level_description": "Developers + Masters"
     }
   ],
   "merge_access_levels": [
     {
       "access_level": 30,
+      "user_id": null,
+      "group_id": null,
       "access_level_description": "Developers + Masters"
     }
   ]

doc/gitlab-geo/database.md

@@ -223,9 +223,6 @@ will not be able to perform all necessary configuration steps. Refer to
     match your database replication requirements. Consult the [PostgreSQL - Replication documentation](https://www.postgresql.org/docs/9.6/static/runtime-config-replication.html)
     for more information.
 
-1. Check to make sure your firewall rules are set so that the secondary nodes
-   can access port `5432` on the primary node.
-
 1. Save the file and [reconfigure GitLab][] for the database listen changes to
    take effect.
 
@@ -319,18 +316,23 @@ primary before the database is replicated.
 1. Test that the remote connection to the primary server works.
 
     ```
-    # Certificate and key currently used by GitLab
-    sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql -h primary.geo.example.com -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-ca" -W
+    # Certificate and key currently used by GitLab, and connecting by FQDN
+    sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql -h primary.geo.example.com -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-full" -W
 
 
-    # Self-signed certificate and key
-    sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql -h 1.2.3.4 -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-full" -W
+    # Self-signed certificate and key, or connecting by IP address
+    sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql -h 1.2.3.4 -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-ca" -W
     ```
 
     When prompted enter the password you set in the first step for the
     `gitlab_replicator` user. If all worked correctly, you should see the
     database prompt.
 
+    A failure to connect here indicates that the TLS or networking configuration
+    is incorrect. Ensure that you've used the correct certificates and IP
+    addresses / FQDNs throughout. If you have a firewall, ensure that the
+    secondary is permitted to access the primary on port 5432.
+
 1. Exit the PostgreSQL console:
 
     ```
@@ -391,10 +393,10 @@ data before running `pg_basebackup`.
 1. Execute the command below to start a backup/restore and begin the replication:
 
     ```
-    # Certificate and key currently used by GitLab
+    # Certificate and key currently used by GitLab, and connecting by FQDN
     gitlab-ctl replicate-geo-database --host=primary.geo.example.com --slot-name=secondary_example
 
-    # Self-signed certificate and key
+    # Self-signed certificate and key, or connecting by IP
     gitlab-ctl replicate-geo-database --host=1.2.3.4 --slot-name=secondary_example --sslmode=verify-ca
     ```
 

doc/gitlab-geo/database_source.md

@@ -270,22 +270,24 @@ primary before the database is replicated.
 
 1. Test that the remote connection to the primary server works:
 
-    If you're using a CA-issued certificate and connecting by FQDN:
 
     ```
+    # Certificate and key currently used by GitLab, and connecting by FQDN
     sudo -u postgres psql -h primary.geo.example.com -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-ca" -W
-    ```
-
-    If you're using a self-signed certificate or connecting by IP address:
 
-    ```
-    sudo -u postgres psql -h 1.2.3.4 -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-full" -W
+    # Self-signed certificate and key, or connecting by IP address
+    sudo -u postgres psql -h 1.2.3.4 -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-ca" -W
     ```
 
     When prompted enter the password you set in the first step for the
     `gitlab_replicator` user. If all worked correctly, you should see the
     database prompt.
 
+    A failure to connect here indicates that the TLS or networking configuration
+    is incorrect. Ensure that you've used the correct certificates and IP
+    addresses / FQDNs throughout. If you have a firewall, ensure that the
+    secondary is permitted to access the primary on port 5432.
+
 1. Exit the PostgreSQL console:
 
     ```

ee/app/controllers/groups/pipeline_quota_controller.rb

 class Groups::PipelineQuotaController < Groups::ApplicationController
   before_action :authorize_admin_group!
+  before_action :validate_shared_runner_minutes_support!
 
   layout 'group_settings'
 
   def index
-    @projects = @group.projects.with_shared_runners_limit_enabled.page(params[:page])
+    @projects = all_projects.with_shared_runners_limit_enabled.page(params[:page])
+  end
+
+  private
+
+  def all_projects
+    if Feature.enabled?(:shared_runner_minutes_on_root_namespace)
+      @group.all_projects
+    else
+      @group.projects
+    end
+  end
+
+  def validate_shared_runner_minutes_support!
+    render_404 unless @group.shared_runner_minutes_supported?
   end
 end

ee/app/models/ee/namespace.rb

@@ -34,6 +34,7 @@ module EE
         to: :namespace_statistics, allow_nil: true
 
       validate :validate_plan_name
+      validate :validate_shared_runner_minutes_support
     end
 
     module ClassMethods
@@ -42,10 +43,6 @@ module EE
       end
     end
 
-    def root_ancestor
-      ancestors.reorder(nil).find_by(parent_id: nil)
-    end
-
     def move_dir
       raise NotImplementedError unless defined?(super)
 
@@ -96,12 +93,21 @@ module EE
       actual_plan&.name || FREE_PLAN
     end
 
+    def shared_runner_minutes_supported?
+      if has_parent?
+        !Feature.enabled?(:shared_runner_minutes_on_root_namespace)
+      else
+        true
+      end
+    end
+
     def actual_shared_runners_minutes_limit
       shared_runners_minutes_limit ||
         current_application_settings.shared_runners_minutes
     end
 
     def shared_runners_minutes_limit_enabled?
+      shared_runner_minutes_supported? &&
         shared_runners_enabled? &&
         actual_shared_runners_minutes_limit.nonzero?
     end
@@ -111,6 +117,14 @@ module EE
         shared_runners_minutes.to_i >= actual_shared_runners_minutes_limit
     end
 
+    def shared_runners_enabled?
+      if Feature.enabled?(:shared_runner_minutes_on_root_namespace)
+        all_projects.with_shared_runners.any?
+      else
+        projects.with_shared_runners.any?
+      end
+    end
+
     # These helper methods are required to not break the Namespace API.
     def plan=(plan_name)
       if plan_name.is_a?(String)
@@ -140,6 +154,14 @@ module EE
       end
     end
 
+    def validate_shared_runner_minutes_support
+      return if shared_runner_minutes_supported?
+
+      if shared_runners_minutes_limit_changed?
+        errors.add(:shared_runners_minutes_limit, 'is not supported for this namespace')
+      end
+    end
+
     def load_feature_available(feature)
       globally_available = License.feature_available?(feature)
 

ee/app/models/ee/project.rb

@@ -54,7 +54,7 @@ module EE
         to: :statistics, allow_nil: true
 
       delegate :actual_shared_runners_minutes_limit,
-        :shared_runners_minutes_used?, to: :namespace
+        :shared_runners_minutes_used?, to: :shared_runners_limit_namespace
 
       validates :repository_size_limit,
         numericality: { only_integer: true, greater_than_or_equal_to: 0, allow_nil: true }
@@ -82,6 +82,14 @@ module EE
       end
     end
 
+    def shared_runners_limit_namespace
+      if Feature.enabled?(:shared_runner_minutes_on_root_namespace)
+        root_namespace
+      else
+        namespace
+      end
+    end
+
     def mirror
       super && feature_available?(:repository_mirrors)
     end
@@ -190,11 +198,12 @@ module EE
     end
 
     def shared_runners_available?
-      super && !namespace.shared_runners_minutes_used?
+      super && !shared_runners_limit_namespace.shared_runners_minutes_used?
     end
 
     def shared_runners_minutes_limit_enabled?
-      !public? && shared_runners_enabled? && namespace.shared_runners_minutes_limit_enabled?
+      !public? && shared_runners_enabled? &&
+        shared_runners_limit_namespace.shared_runners_minutes_limit_enabled?
     end
 
     def feature_available?(feature, user = nil)

ee/app/services/ee/ci/register_job_service.rb

@@ -17,8 +17,7 @@ module EE
       end
 
       def builds_check_limit
-        ::Namespace.reorder(nil)
-          .where('namespaces.id = projects.namespace_id')
+        all_namespaces
           .joins('LEFT JOIN namespace_statistics ON namespace_statistics.namespace_id = namespaces.id')
           .where('COALESCE(namespaces.shared_runners_minutes_limit, ?, 0) = 0 OR ' \
             'COALESCE(namespace_statistics.shared_runners_seconds, 0) < COALESCE(namespaces.shared_runners_minutes_limit, ?, 0) * 60',
@@ -26,6 +25,16 @@ module EE
           .select('1')
       end
 
+      def all_namespaces
+        namespaces = ::Namespace.reorder(nil).where('namespaces.id = projects.namespace_id')
+
+        if Feature.enabled?(:shared_runner_minutes_on_root_namespace)
+          namespaces = ::Gitlab::GroupHierarchy.new(namespaces).roots
+        end
+
+        namespaces
+      end
+
       def application_shared_runners_minutes
         current_application_settings.shared_runners_minutes
       end

ee/app/services/update_build_minutes_service.rb

@@ -18,10 +18,10 @@ class UpdateBuildMinutesService < BaseService
   end
 
   def project_statistics
-    project.statistics || project.create_statistics(namespace: namespace)
+    project.statistics || project.create_statistics(namespace: project.namespace)
   end
 
   def namespace
-    project.namespace
+    project.shared_runners_limit_namespace
   end
 end

ee/app/views/namespaces/pipelines_quota/_list.haml

@@ -33,7 +33,7 @@
         %td
           .avatar-container.s20.hidden-xs
             = project_icon(project, alt: '', class: 'avatar project-avatar s20')
-          %strong= link_to project.name, project
+          %strong= link_to project.full_name, project
         %td
           = project.shared_runners_minutes
     - if projects.blank?

ee/app/views/projects/jobs/_shared_runner_limit_warning.html.haml

-- if project.namespace.shared_runners_minutes_used?
-  - quota_used = project.namespace.shared_runners_minutes
-  - quota_limit = project.namespace.actual_shared_runners_minutes_limit
+- if project.shared_runners_limit_namespace.shared_runners_minutes_used?
+  - quota_used = project.shared_runners_limit_namespace.shared_runners_minutes
+  - quota_limit = project.shared_runners_limit_namespace.actual_shared_runners_minutes_limit
   .bs-callout.bs-callout-warning
     %p
       You have used all your shared Runners pipeline minutes.

ee/app/views/shared/_shared_runners_minutes_limit.html.haml

 - project = local_assigns.fetch(:project, nil)
-- namespace = local_assigns.fetch(:namespace, project && project.namespace)
+- namespace = local_assigns.fetch(:namespace, project && project.shared_runners_limit_namespace)
 - scope = (project || namespace).full_path
 - has_limit = (project || namespace).shared_runners_minutes_limit_enabled?
 - can_see_status = project.nil? || can?(current_user, :create_pipeline, project)

lib/api/entities.rb

@@ -341,6 +341,12 @@ module API
 
     class ProtectedRefAccess < Grape::Entity
       expose :access_level
+
+      ## EE-only
+      expose :user_id
+      expose :group_id
+      ## EE-only
+
       expose :access_level_description do |protected_ref_access|
         protected_ref_access.humanize
       end

lib/gitlab/git/repository.rb

@@ -1246,11 +1246,19 @@ module Gitlab
       # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/695
       def git_merged_branch_names(branch_names = [])
         root_sha = find_branch(root_ref).target
+<<<<<<< HEAD
 
         git_arguments =
           %W[branch --merged #{root_sha}
              --format=%(refname:short)\ %(objectname)] + branch_names
 
+=======
+
+        git_arguments =
+          %W[branch --merged #{root_sha}
+             --format=%(refname:short)\ %(objectname)] + branch_names
+
+>>>>>>> origin/master
         lines = run_git(git_arguments).first.lines
 
         lines.each_with_object([]) do |line, branches|

lib/gitlab/group_hierarchy.rb

@@ -33,6 +33,10 @@ module Gitlab
       base_and_ancestors(upto: upto).where.not(id: ancestors_base.select(:id))
     end
 
+    def roots
+      base_and_ancestors.where(namespaces: { parent_id: nil })
+    end
+
     # Returns a relation that includes the ancestors_base set of groups
     # and all their ancestors (recursively).
     #

spec/features/groups/pipeline_quota_spec.rb → spec/ee/spec/features/groups/pipeline_quota_spec.rb

@@ -95,8 +95,56 @@ feature 'Groups > Pipeline Quota' do
       end
 
       page.within('.pipeline-project-metrics') do
-        expect(page).to have_content(project.name)
-        expect(page).not_to have_content(other_project.name)
+        expect(page).to have_content(project.full_name)
+        expect(page).not_to have_content(other_project.full_name)
+      end
+    end
+  end
+
+  context 'with shared_runner_minutes_on_root_namespace disabled' do
+    before do
+      stub_feature_flags(shared_runner_minutes_on_root_namespace: false)
+    end
+
+    context 'when accessing group with subgroups' do
+      let(:group) { create(:group, :with_used_build_minutes_limit) }
+      let!(:subgroup) { create(:group, parent: group) }
+      let!(:subproject) { create(:project, namespace: subgroup, shared_runners_enabled: true) }
+
+      it 'does not show project of subgroup' do
+        visit_pipeline_quota_page
+
+        expect(page).to have_content(project.full_name)
+        expect(page).not_to have_content(subproject.full_name)
+      end
+    end
+  end
+
+  context 'with shared_runner_minutes_on_root_namespace enabled', :nested_groups do
+    before do
+      stub_feature_flags(shared_runner_minutes_on_root_namespace: true)
+    end
+
+    context 'when accessing subgroup' do
+      let(:root_ancestor) { create(:group) }
+      let(:group) { create(:group, parent: root_ancestor) }
+
+      it 'does not show subproject' do
+        visit_pipeline_quota_page
+
+        expect(page).to have_http_status(:not_found)
+      end
+    end
+
+    context 'when accesing root group' do
+      let!(:subgroup) { create(:group, parent: group) }
+      let!(:subproject) { create(:project, namespace: subgroup, shared_runners_enabled: true) }
+
+      it 'does show projects of subgroup' do
+        visit_pipeline_quota_page
+
+        expect(page).to have_content(project.full_name)
+        expect(page).to have_content(subproject.full_name)
       end
     end
   end

spec/ee/spec/models/ee/namespace_spec.rb

@@ -63,6 +63,34 @@ describe Namespace do
         end
       end
     end
+
+    describe '#validate_shared_runner_minutes_support' do
+      before do
+        stub_feature_flags(shared_runner_minutes_on_root_namespace: true)
+      end
+
+      context 'when changing :shared_runners_minutes_limit' do
+        before do
+          namespace.shared_runners_minutes_limit = 100
+        end
+
+        context 'when group is subgroup' do
+          set(:root_ancestor) { create(:group) }
+          let(:namespace) { create(:namespace, parent: root_ancestor) }
+
+          it 'is invalid' do
+            expect(namespace).not_to be_valid
+            expect(namespace.errors[:shared_runners_minutes_limit]).to include('is not supported for this namespace')
+          end
+        end
+
+        context 'when group is root' do
+          it 'is valid' do
+            expect(namespace).to be_valid
+          end
+        end
+      end
+    end
   end
 
   describe '#move_dir' do
@@ -295,6 +323,42 @@ describe Namespace do
     end
   end
 
+  describe '#shared_runner_minutes_supported?' do
+    subject { namespace.shared_runner_minutes_supported? }
+
+    context 'when is subgroup' do
+      before do
+        namespace.parent = build(:group)
+      end
+
+      context 'when shared_runner_minutes_on_root_namespace is disabled' do
+        before do
+          stub_feature_flags(shared_runner_minutes_on_root_namespace: false)
+        end
+
+        it 'returns true' do
+          is_expected.to eq(true)
+        end
+      end
+
+      context 'when shared_runner_minutes_on_root_namespace is enabled', :nested_groups do
+        before do
+          stub_feature_flags(shared_runner_minutes_on_root_namespace: true)
+        end
+
+        it 'returns false' do
+          is_expected.to eq(false)
+        end
+      end
+    end
+
+    context 'when is root' do
+      it 'returns true' do
+        is_expected.to eq(true)
+      end
+    end
+  end
+
   describe '#shared_runners_minutes_limit_enabled?' do
     subject { namespace.shared_runners_minutes_limit_enabled? }
 
@@ -315,6 +379,15 @@ describe Namespace do
         end
 
         it { is_expected.to be_truthy }
+
+        context 'when is subgroup', :nested_groups do
+          before do
+            stub_feature_flags(shared_runner_minutes_on_root_namespace: true)
+            namespace.parent = build(:group)
+          end
+
+          it { is_expected.to be_falsey }
+        end
       end
     end
 
@@ -323,6 +396,49 @@ describe Namespace do
     end
   end
 
+  describe '#shared_runners_enabled?' do
+    subject { namespace.shared_runners_enabled? }
+
+    context 'subgroup with shared runners enabled project' do
+      let(:subgroup) { create(:group, parent: namespace) }
+      let!(:subproject) { create(:project, namespace: subgroup, shared_runners_enabled: true) }
+
+      context 'when shared_runner_minutes_on_root_namespace is disabled' do
+        before do
+          stub_feature_flags(shared_runner_minutes_on_root_namespace: false)
+        end
+
+        it "returns false" do
+          is_expected.to eq(false)
+        end
+      end
+
+      context 'when shared_runner_minutes_on_root_namespace is enabled', :nested_groups do
+        before do
+          stub_feature_flags(shared_runner_minutes_on_root_namespace: true)
+        end
+
+        it "returns true" do
+          is_expected.to eq(true)
+        end
+      end
+    end
+
+    context 'group with shared runners enabled project' do
+      let!(:project) { create(:project, namespace: namespace, shared_runners_enabled: true) }
+
+      it "returns true" do
+        is_expected.to eq(true)
+      end
+    end
+
+    context 'group without projects' do
+      it "returns false" do
+        is_expected.to eq(false)
+      end
+    end
+  end
+
   describe '#shared_runners_minutes_used?' do
     subject { namespace.shared_runners_minutes_used? }
 
@@ -363,19 +479,6 @@ describe Namespace do
     end
   end
 
-  describe '#root_ancestor' do
-    it 'returns the top most ancestor', :nested_groups do
-      root_group = create(:group)
-      nested_group = create(:group, parent: root_group)
-      deep_nested_group = create(:group, parent: nested_group)
-      very_deep_nested_group = create(:group, parent: deep_nested_group)
-
-      expect(nested_group.root_ancestor).to eq(root_group)
-      expect(deep_nested_group.root_ancestor).to eq(root_group)
-      expect(very_deep_nested_group.root_ancestor).to eq(root_group)
-    end
-  end
-
   describe '#actual_plan' do
     context 'when namespace has a plan associated' do
       before do

spec/ee/spec/models/ee/project_spec.rb

@@ -8,9 +8,9 @@ describe Project do
     it { is_expected.to delegate_method(:shared_runners_seconds).to(:statistics) }
     it { is_expected.to delegate_method(:shared_runners_seconds_last_reset).to(:statistics) }
 
-    it { is_expected.to delegate_method(:actual_shared_runners_minutes_limit).to(:namespace) }
-    it { is_expected.to delegate_method(:shared_runners_minutes_limit_enabled?).to(:namespace) }
-    it { is_expected.to delegate_method(:shared_runners_minutes_used?).to(:namespace) }
+    it { is_expected.to delegate_method(:actual_shared_runners_minutes_limit).to(:shared_runners_limit_namespace) }
+    it { is_expected.to delegate_method(:shared_runners_minutes_limit_enabled?).to(:shared_runners_limit_namespace) }
+    it { is_expected.to delegate_method(:shared_runners_minutes_used?).to(:shared_runners_limit_namespace) }
 
     it { is_expected.to have_one(:mirror_data).class_name('ProjectMirrorData') }
     it { is_expected.to have_many(:path_locks) }
@@ -532,6 +532,34 @@ describe Project do
     end
   end
 
+  describe '#shared_runners_limit_namespace' do
+    set(:root_ancestor) { create(:group) }
+    set(:group) { create(:group, parent: root_ancestor) }
+    let(:project) { create(:project, namespace: group) }
+
+    subject { project.shared_runners_limit_namespace }
+
+    context 'when shared_runner_minutes_on_root_namespace is disabled' do
+      before do
+        stub_feature_flags(shared_runner_minutes_on_root_namespace: false)
+      end
+
+      it 'returns parent namespace' do
+        is_expected.to eq(group)
+      end
+    end
+
+    context 'when shared_runner_minutes_on_root_namespace is enabled', :nested_groups do
+      before do
+        stub_feature_flags(shared_runner_minutes_on_root_namespace: true)
+      end
+
+      it 'returns root namespace' do
+        is_expected.to eq(root_ancestor)
+      end
+    end
+  end
+
   describe '#shared_runners_minutes_limit_enabled?' do
     let(:project) { create(:project) }
 

spec/ee/spec/services/ee/ci/register_job_service_spec.rb

@@ -62,6 +62,66 @@ module Ci
             end
           end
         end
+
+        context 'when group is subgroup' do
+          let!(:root_ancestor) { create(:group) }
+          let!(:group) { create(:group, parent: root_ancestor) }
+          let!(:project) { create :project, shared_runners_enabled: true, group: group }
+          let(:build) { execute(shared_runner) }
+
+          context 'when shared_runner_minutes_on_root_namespace is disabled' do
+            before do
+              stub_feature_flags(shared_runner_minutes_on_root_namespace: false)
+            end
+
+            it "does return a build" do
+              expect(build).not_to be_nil
+            end
+
+            context 'when we are over limit on subnamespace' do
+              before do
+                group.create_namespace_statistics(
+                  shared_runners_seconds: 6001)
+              end
+
+              it "does not return a build" do
+                expect(build).to be_nil
+              end
+            end
+          end
+
+          context 'when shared_runner_minutes_on_root_namespace is enabled', :nested_groups do
+            before do
+              stub_feature_flags(shared_runner_minutes_on_root_namespace: true)
+            end
+
+            it "does return a build" do
+              expect(build).not_to be_nil
+            end
+
+            context 'when we are over limit on subnamespace' do
+              before do
+                group.create_namespace_statistics(
+                  shared_runners_seconds: 6001)
+              end
+
+              it "limit is ignored and build is returned" do
+                expect(build).not_to be_nil
+              end
+            end
+
+            context 'when we are over limit on root namespace' do
+              before do
+                root_ancestor.create_namespace_statistics(
+                  shared_runners_seconds: 6001)
+              end
+
+              it "does not return a build" do
+                expect(build).to be_nil
+              end
+            end
+          end
+        end
       end
 
       def execute(runner)

spec/ee/spec/views/admin/groups/_form.html.haml_spec.rb

+require 'spec_helper'
+
+describe 'admin/groups/_form' do
+  set(:admin) { create(:admin) }
+
+  before do
+    assign(:group, group)
+    allow(view).to receive(:can?) { true }
+    allow(view).to receive(:current_user) { admin }
+    allow(view).to receive(:visibility_level) { group.visibility_level }
+  end
+
+  describe 'when :shared_runner_minutes_on_root_namespace is disabled' do
+    before do
+      stub_feature_flags(shared_runner_minutes_on_root_namespace: false)
+    end
+
+    context 'when sub group is used' do
+      let(:root_ancestor) { create(:group) }
+      let(:group) { build(:group, parent: root_ancestor) }
+
+      it 'renders shared_runners_minutes_setting' do
+        render
+
+        expect(rendered).to render_template('namespaces/_shared_runners_minutes_setting')
+      end
+    end
+  end
+
+  describe 'when :shared_runner_minutes_on_root_namespace is enabled', :nested_groups do
+    before do
+      stub_feature_flags(shared_runner_minutes_on_root_namespace: true)
+    end
+
+    context 'when sub group is used' do
+      let(:root_ancestor) { create(:group) }
+      let(:group) { build(:group, parent: root_ancestor) }
+
+      it 'does not render shared_runners_minutes_setting' do
+        render
+
+        expect(rendered).not_to render_template('namespaces/_shared_runners_minutes_setting')
+      end
+    end
+
+    context 'when root group is used' do
+      let(:group) { build(:group) }
+
+      it 'does not render shared_runners_minutes_setting' do
+        render
+
+        expect(rendered).to render_template('namespaces/_shared_runners_minutes_setting')
+      end
+    end
+  end
+end

spec/javascripts/environments/emtpy_state_spec.js

+<<<<<<< HEAD
 
+=======
+>>>>>>> origin/master
 import Vue from 'vue';
 import emptyState from '~/environments/components/empty_state.vue';
 import mountComponent from '../helpers/vue_mount_component_helper';

spec/javascripts/environments/environments_app_spec.js

@@ -128,7 +128,10 @@ describe('Environment', () => {
           setTimeout(() => {
             spyOn(component, 'updateContent');
             component.$el.querySelector('.js-environments-tab-stopped').click();
+<<<<<<< HEAD:spec/javascripts/environments/environments_app_spec.js
 
+=======
+>>>>>>> origin/master:spec/javascripts/environments/environments_app_spec.js
             expect(component.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' });
             done();
           });

spec/javascripts/environments/folder/environments_folder_view_spec.js

@@ -95,7 +95,11 @@ describe('Environments Folder View', () => {
     it('should render parent folder name', (done) => {
       setTimeout(() => {
         expect(
+<<<<<<< HEAD
           component.$el.querySelector('.js-folder-name').textContent.trim(),
+=======
+          component.$el.querySelector('.js-folder-name').textContent,
+>>>>>>> origin/master
         ).toContain('Environments / review');
         done();
       }, 0);
@@ -107,6 +111,7 @@ describe('Environments Folder View', () => {
           expect(
             component.$el.querySelectorAll('.gl-pagination'),
           ).not.toBeNull();
+<<<<<<< HEAD
           done();
         }, 0);
       });
@@ -117,15 +122,33 @@ describe('Environments Folder View', () => {
           component.$el.querySelector('.gl-pagination .js-last-button a').click();
 
           expect(component.updateContent).toHaveBeenCalledWith({ scope: component.scope, page: '10' });
+=======
+>>>>>>> origin/master
           done();
         }, 0);
       });
 
+<<<<<<< HEAD
       it('should make an API request when using tabs', (done) => {
         setTimeout(() => {
           spyOn(component, 'updateContent');
           component.$el.querySelector('.js-environments-tab-stopped').click();
 
+=======
+      it('should make an API request when changing page', (done) => {
+        spyOn(component, 'updateContent');
+        setTimeout(() => {
+          component.$el.querySelector('.gl-pagination .js-last-button a').click();
+          expect(component.updateContent).toHaveBeenCalledWith({ scope: component.scope, page: '10' });
+          done();
+        }, 0);
+      });
+
+      it('should make an API request when using tabs', (done) => {
+        setTimeout(() => {
+          spyOn(component, 'updateContent');
+          component.$el.querySelector('.js-environments-tab-stopped').click();
+>>>>>>> origin/master
           expect(component.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' });
           done();
         });

spec/javascripts/pipelines/pipelines_spec.js

@@ -187,6 +187,7 @@ describe('Pipelines', () => {
           store: new Store(),
         });
         component.updateContent({ scope: 'finished', page: '4' });
+<<<<<<< HEAD
 
         expect(component.page).toEqual('4');
         expect(component.scope).toEqual('finished');
@@ -213,6 +214,36 @@ describe('Pipelines', () => {
         component = mountComponent(PipelinesComponent, {
           store: new Store(),
         });
+=======
+
+        expect(component.page).toEqual('4');
+        expect(component.scope).toEqual('finished');
+        expect(component.requestData.scope).toEqual('finished');
+        expect(component.requestData.page).toEqual('4');
+      });
+    });
+
+    describe('onChangeTab', () => {
+      it('should set page to 1', () => {
+        component = mountComponent(PipelinesComponent, {
+          store: new Store(),
+        });
+
+        spyOn(component, 'updateContent');
+
+        component.onChangeTab('running');
+
+        expect(component.updateContent).toHaveBeenCalledWith({ scope: 'running', page: '1' });
+      });
+    });
+
+    describe('onChangePage', () => {
+      it('should update page and keep scope', () => {
+        component = mountComponent(PipelinesComponent, {
+          store: new Store(),
+        });
+
+>>>>>>> origin/master
         spyOn(component, 'updateContent');
 
         component.onChangePage(4);

spec/lib/gitlab/group_hierarchy_spec.rb

@@ -83,6 +83,20 @@ describe Gitlab::GroupHierarchy, :postgresql do
     end
   end
 
+  describe '#root' do
+    it 'includes only the roots' do
+      relation = described_class.new(Group.where(id: child2)).roots
+
+      expect(relation).to contain_exactly(parent)
+    end
+
+    it 'when quering parent it includes parent' do
+      relation = described_class.new(Group.where(id: parent)).roots
+
+      expect(relation).to contain_exactly(parent)
+    end
+  end
+
   describe '#all_groups' do
     let(:relation) do
       described_class.new(Group.where(id: child1.id)).all_groups

spec/models/namespace_spec.rb

@@ -675,4 +675,17 @@ describe Namespace do
       expect(other_namespace.find_fork_of(project)).to eq(other_fork)
     end
   end
+
+  describe '#root_ancestor' do
+    it 'returns the top most ancestor', :nested_groups do
+      root_group = create(:group)
+      nested_group = create(:group, parent: root_group)
+      deep_nested_group = create(:group, parent: nested_group)
+      very_deep_nested_group = create(:group, parent: deep_nested_group)
+
+      expect(nested_group.root_ancestor).to eq(root_group)
+      expect(deep_nested_group.root_ancestor).to eq(root_group)
+      expect(very_deep_nested_group.root_ancestor).to eq(root_group)
+    end
+  end
 end

spec/models/project_spec.rb

@@ -3474,4 +3474,27 @@ describe Project do
       expect(project.wiki_repository_exists?).to eq(false)
     end
   end
+
+  describe '#root_namespace' do
+    let(:project) { build(:project, namespace: parent) }
+
+    subject { project.root_namespace }
+
+    context 'when namespace has parent group' do
+      let(:root_ancestor) { create(:group) }
+      let(:parent) { build(:group, parent: root_ancestor) }
+
+      it 'returns root ancestor' do
+        is_expected.to eq(root_ancestor)
+      end
+    end
+
+    context 'when namespace is root ancestor' do
+      let(:parent) { build(:group) }
+
+      it 'returns current namespace' do
+        is_expected.to eq(parent)
+      end
+    end
+  end
 end

spec/requests/api/protected_branches_spec.rb

@@ -66,6 +66,27 @@ describe API::ProtectedBranches do
           let(:message) { '404 Not found' }
         end
       end
+
+      context 'with per user/group access levels' do
+        let(:push_user) { create(:user) }
+        let(:merge_group) { create(:group) }
+
+        before do
+          protected_branch.push_access_levels.create!(user: push_user)
+          protected_branch.merge_access_levels.create!(group: merge_group)
+        end
+
+        it 'returns access level details' do
+          get api(route, user)
+
+          push_user_ids = json_response['push_access_levels'].map {|level| level['user_id']}
+          merge_group_ids = json_response['merge_access_levels'].map {|level| level['group_id']}
+
+          expect(response).to have_gitlab_http_status(200)
+          expect(push_user_ids).to include(push_user.id)
+          expect(merge_group_ids).to include(merge_group.id)
+        end
+      end
     end
 
     context 'when authenticated as a master' do

spec/services/update_build_minutes_service_spec.rb

@@ -42,6 +42,40 @@ describe UpdateBuildMinutesService do
             .to eq(100 + build.duration.to_i)
         end
       end
+
+      context 'when namespace is subgroup' do
+        let(:root_ancestor) { create(:group, shared_runners_minutes_limit: 100) }
+
+        context 'when shared_runner_minutes_on_root_namespace is disabled' do
+          let(:namespace) { create(:namespace, parent: root_ancestor, shared_runners_minutes_limit: 100) }
+
+          before do
+            stub_feature_flags(shared_runner_minutes_on_root_namespace: false)
+          end
+
+          it 'creates a statistics in current namespace' do
+            subject
+
+            expect(namespace.namespace_statistics.reload.shared_runners_seconds)
+              .to eq(build.duration.to_i)
+          end
+        end
+
+        context 'when shared_runner_minutes_on_root_namespace is enabled', :nested_groups do
+          let(:namespace) { create(:namespace, parent: root_ancestor) }
+
+          before do
+            stub_feature_flags(shared_runner_minutes_on_root_namespace: true)
+          end
+
+          it 'creates a statistics in root namespace' do
+            subject
+
+            expect(root_ancestor.namespace_statistics.reload.shared_runners_seconds)
+              .to eq(build.duration.to_i)
+          end
+        end
+      end
     end
 
     context 'for specific runner' do