Resolve conflicts

09484066 · Nick Thomas · e2e1cac2 · 09484066 · 09484066 · 09484066
Commit 09484066 authored Apr 27, 2017 by Nick Thomas
6 changed files
--- a/app/assets/javascripts/environments/components/environment.vue
+++ b/app/assets/javascripts/environments/components/environment.vue
@@ -221,27 +221,6 @@ export default {
          <a :href="helpPagePath">
            Read more about environments
          </a>
-<<<<<<< HEAD:app/assets/javascripts/environments/components/environment.js
-        </div>
-        <div class="table-holder"
-          v-if="!isLoading && state.environments.length > 0">
-          <environment-table
-            :environments="state.environments"
-            :can-create-deployment="canCreateDeploymentParsed"
-            :can-read-environment="canReadEnvironmentParsed"
-            :toggleDeployBoard="toggleDeployBoard"
-            :store="store"
-            :service="service"
-            :is-loading-folder-content="isLoadingFolderContent" />
-        </div>
-        <table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
-          :change="changePage"
-          :pageInfo="state.paginationInformation">
-        </table-pagination>
-=======
        </p>
        <a
@@ -250,7 +229,6 @@ export default {
          class="btn btn-create js-new-environment-button">
          New Environment
        </a>
->>>>>>> ce/master:app/assets/javascripts/environments/components/environment.vue
      </div>
      <div
@@ -261,6 +239,8 @@ export default {
          :environments="state.environments"
          :can-create-deployment="canCreateDeploymentParsed"
          :can-read-environment="canReadEnvironmentParsed"
+          :toggleDeployBoard="toggleDeployBoard"
+          :store="store"
          :service="service"
          :is-loading-folder-content="isLoadingFolderContent" />
      </div>

--- a/app/assets/javascripts/environments/folder/environments_folder_view.vue
+++ b/app/assets/javascripts/environments/folder/environments_folder_view.vue
@@ -177,21 +177,13 @@ export default {
        class="table-holder"
        v-if="!isLoading && state.environments.length > 0">
-<<<<<<< HEAD:app/assets/javascripts/environments/folder/environments_folder_view.js
-          <environment-table
-            :environments="state.environments"
-            :can-create-deployment="canCreateDeploymentParsed"
-            :can-read-environment="canReadEnvironmentParsed"
-            :toggleDeployBoard="toggleDeployBoard"
-            :store="store"
-            :service="service"/>
-=======
        <environment-table
          :environments="state.environments"
          :can-create-deployment="canCreateDeploymentParsed"
          :can-read-environment="canReadEnvironmentParsed"
+          :toggleDeployBoard="toggleDeployBoard"
+          :store="store"
          :service="service"/>
->>>>>>> ce/master:app/assets/javascripts/environments/folder/environments_folder_view.vue
        <table-pagination
          v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"

--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -5,10 +5,7 @@ class ProjectPolicy < BasePolicy
    team_access!(user)
    owner_access! if user.admin? || owner?
-<<<<<<< HEAD
    auditor_access! if user.auditor?
-=======
->>>>>>> ce/master
    team_member_owner_access! if owner?
    if project.public? || (project.internal? && !user.external?)

--- a/doc/README.md
+++ b/doc/README.md
 # GitLab Enterprise Edition
-<<<<<<< HEAD
-[GitLab](https://about.gitlab.com/) is a Git-based fully featured platform for software development.
-**[GitLab Enterprise Edition (EE)](https://about.gitlab.com/gitlab-ee/)** is an opencore product, self-hosted, available under distinct [subscriptions](https://about.gitlab.com/products/).
-GitLab EE contains all the features available in [GitLab Community Edition (CE)](https://docs.gitlab.com/ce/), plus premium features available in each version: **Enterprise Edition Starter** (**EES**) and **Enterprise Edition Premium** (**EEP**). Everything available in **EES** is also available in **EEP**.
----
-=======
 [GitLab](https://about.gitlab.com/) is a Git-based fully featured platform
 for software development.
-**GitLab Community Edition (CE)** is an opensource product, self-hosted, free to use.
+**GitLab Enterprise Edition (EE)** is an opencore product, self-hosted,
-All [GitLab products](https://about.gitlab.com/products/) contain the features
+available under distinct [subscriptions](https://about.gitlab.com/products/).
-available in GitLab CE. Premium features are available in
-[GitLab Enterprise Edition (EE)](https://about.gitlab.com/gitlab-ee/).
+GitLab EE contains all the features available in
+[GitLab Community Edition (CE)](https://docs.gitlab.com/ce/),
+plus premium features available in each version: **Enterprise Edition Starter**
+(**EES**) and **Enterprise Edition Premium** (**EEP**). Everything available in
+**EES** is also available in **EEP**.
 ----
->>>>>>> ce/master
 Shortcuts to GitLab's most visited docs:
 | [GitLab CI](ci/README.md) | Other |
@@ -35,11 +28,7 @@ Shortcuts to GitLab's most visited docs:
 - [GitLab Workflow](workflow/README.md): Enhance your workflow with the best of GitLab Workflow.
  - See also [GitLab Workflow - an overview](https://about.gitlab.com/2016/10/25/gitlab-workflow-an-overview/).
 - [GitLab Markdown](user/markdown.md): GitLab's advanced formatting system (GitLab Flavored Markdown).
-<<<<<<< HEAD
- [GitLab Slash Commands](user/project/slash_commands.md): Textual shortcuts for common actions on issues or merge requests that are usually done by clicking buttons or dropdowns in GitLab's UI
-=======
 - [GitLab Slash Commands](user/project/slash_commands.md): Textual shortcuts for common actions on issues or merge requests that are usually done by clicking buttons or dropdowns in GitLab's UI.
->>>>>>> ce/master
 ### User account
@@ -68,18 +57,12 @@ Manage files and branches from the UI (user interface):
  - [File templates](user/project/repository/web_editor.md#template-dropdowns)
  - [Create a directory](user/project/repository/web_editor.md#create-a-directory)
  - [Start a merge request](user/project/repository/web_editor.md#tips) (when committing via UI)
-<<<<<<< HEAD
  - **(EES/EEP)** [Lock a file](user/project/file_lock.md): Lock a file to avoid merge conflicts.
 - Branches
  - [Create a branch](user/project/repository/web_editor.md#create-a-new-branch)
  - [Protected branches](user/project/protected_branches.md#protected-branches)
 - **(EES/EEP)** [Repository Mirroring](workflow/repository_mirroring.md)
 - **(EES/EEP)** [Push rules](push_rules/push_rules.md): Additional control over pushes to your project.
-=======
- Branches
-  - [Create a branch](user/project/repository/web_editor.md#create-a-new-branch)
-  - [Protected branches](user/project/protected_branches.md#protected-branches)
->>>>>>> ce/master
 ### Issues and Merge Requests (MRs)
@@ -92,21 +75,13 @@ Manage files and branches from the UI (user interface):
 - [Issues and merge requests templates](user/project/description_templates.md): Create templates for submitting new issues and merge requests.
 - [Labels](user/project/labels.md): Categorize your issues or merge requests based on descriptive titles.
 - [Merge Requests](user/project/merge_requests/index.md)
-<<<<<<< HEAD
+  - [Work In Progress Merge Requests](user/project/merge_requests/work_in_progress_merge_requests.md)
-  - [WIP Merge Requests](user/project/merge_requests/work_in_progress_merge_requests.md)
  - [Merge Request discussion resolution](user/discussions/index.md#moving-a-single-discussion-to-a-new-issue): Resolve discussions, move discussions in a merge request to an issue, only allow merge requests to be merged if all discussions are resolved.
  - **(EES/EEP)** [Merge Request approval](user/project/merge_requests/merge_request_approvals.md): Make sure every merge request is approved by one or more people before getting merged.
  - [Checkout merge requests locally](user/project/merge_requests/index.md#checkout-merge-requests-locally)
  - [Cherry-pick](user/project/merge_requests/cherry_pick_changes.md)
 - [Milestones](user/project/milestones/index.md): Organize issues and merge requests into a cohesive group, optionally setting a due date.
  - **(EES/EEP)** [Burndown Charts](user/project/milestones/index.md#burndown-charts): Watch your project's progress throughout a specific milestone.
-=======
-  - [Work In Progress Merge Requests](user/project/merge_requests/work_in_progress_merge_requests.md)
-  - [Merge Request discussion resolution](user/discussions/index.md#moving-a-single-discussion-to-a-new-issue): Resolve discussions, move discussions in a merge request to an issue, only allow merge requests to be merged if all discussions are resolved.
-  - [Checkout merge requests locally](user/project/merge_requests/index.md#checkout-merge-requests-locally)
-  - [Cherry-pick](user/project/merge_requests/cherry_pick_changes.md)
- [Milestones](user/project/milestones/index.md): Organize issues and merge requests into a cohesive group, optionally setting a due date.
->>>>>>> ce/master
 - [Todos](workflow/todos.md): A chronological list of to-dos that are waiting for your input, all in a simple dashboard.
 ### Git and GitLab
@@ -124,12 +99,9 @@ Manage files and branches from the UI (user interface):
 Take a step ahead and dive into GitLab's advanced features.
-<<<<<<< HEAD
 - **(EEP)** [GitLab Service Desk](user/project/service_desk.md): A simple way to allow people to create issues in your GitLab instance without needing their own user account.
 - **(EEP)** [File Locking](user/project/file_lock.md): Lock a file to avoid merge conflicts.
 - **(EES/EEP)** [Contribution Analytics](analytics/contribution_analytics.md): See detailed statistics of projects' contributors.
-=======
->>>>>>> ce/master
 - [GitLab Pages](user/project/pages/index.md): Build, test, and deploy your static website with GitLab Pages.
 - [Snippets](user/snippets.md): Snippets allow you to create little bits of code.
 - [Wikis](workflow/project_features.md#wiki): Enhance your repository documentation with built-in wikis.
@@ -139,11 +111,8 @@ Take a step ahead and dive into GitLab's advanced features.
 - [GitLab CI](ci/README.md): Explore the features and capabilities of Continuous Integration, Continuous Delivery, and Continuous Deployment with GitLab.
  - [Auto Deploy](ci/autodeploy/index.md): Configure GitLab CI for the deployment of your application.
  - [Review Apps](ci/review_apps/index.md): Preview changes to your app right from a merge request.
-<<<<<<< HEAD
  - **(EEP)** [Deploy Boards](user/project/deploy_boards.md): View of the current health and status of each CI environment running on Kubernetes, displaying the status of the pods in the deployment.
  - **(EEP)** [Canary Deployments](user/project/deploy_boards.md#canary-deployments): A popular CI strategy, where a small portion of the fleet is updated to the new version first.
-=======
->>>>>>> ce/master
 - [GitLab Cycle Analytics](user/project/cycle_analytics.md): Cycle Analytics measures the time it takes to go from an [idea to production](https://about.gitlab.com/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/#from-idea-to-production-with-gitlab) for each project you have.
 - [GitLab Container Registry](user/project/container_registry.md): Learn how to use GitLab's built-in Container Registry.
@@ -155,11 +124,7 @@ Take a step ahead and dive into GitLab's advanced features.
 ### Integrations
 - [Project Services](user/project/integrations/project_services.md): Integrate a project with external services, such as CI and chat.
-<<<<<<< HEAD
- [GitLab Integrations](integration/README.md): Integrate with multiple third-party services with GitLab to allow external issue trackers and external authentication.
-=======
 - [GitLab Integration](integration/README.md): Integrate with multiple third-party services with GitLab to allow external issue trackers and external authentication.
->>>>>>> ce/master
 ----
@@ -175,27 +140,23 @@ have access to GitLab administration tools and settings.
 - [Migrate GitLab CI to CE/EE](migrate_ci_to_ce/README.md): If you have an old GitLab installation (older than 8.0), follow this guide to migrate your existing GitLab CI data to GitLab CE/EE.
 - [Restart GitLab](administration/restart_gitlab.md): Learn how to restart GitLab and its components.
 - [Update](update/README.md): Update guides to upgrade your installation.
-<<<<<<< HEAD
 - [Upload your GitLab License](user/admin_area/license.md) Upload the license you purchased for GitLab Enterprise Edition to unlock its features.
-=======
->>>>>>> ce/master
 ### User permissions
 - [Access restrictions](user/admin_area/settings/visibility_and_access_controls.md#enabled-git-access-protocols): Define which Git access protocols can be used to talk to GitLab
 - [Authentication/Authorization](topics/authentication/index.md#gitlab-administrators): Enforce 2FA, configure external authentication with LDAP, SAML, CAS and additional Omniauth providers.
-<<<<<<< HEAD
  - **(EES/EEP)** [Sync LDAP](administration/auth/ldap-ee.md)
  - **(EES/EEP)** [Kerberos authentication](integration/kerberos.md)
 ### GitLab admins' superpowers
- [Container Registry](administration/container_registry.md): Configure Container Registry with GitLab.
+- [Container Registry](administration/container_registry.md): Configure Docker Registry with GitLab.
 - [Custom Git hooks](administration/custom_hooks.md): Custom Git hooks (on the filesystem) for when webhooks aren't enough.
- [Git LFS configuration](workflow/lfs/lfs_administration.md): Enable/disable Git LFS, change the location of LFS object storage.
+- [Git LFS configuration](workflow/lfs/lfs_administration.md): Learn how to use LFS under GitLab.
 - [GitLab Pages configuration](administration/pages/index.md): Configure GitLab Pages.
 - [High Availability](administration/high_availability/README.md): Configure multiple servers for scaling or high availability.
- [User cohorts](user/admin_area/user_cohorts.md): View user activity over time.
+- [User cohorts](user/admin_area/user_cohorts.md) View user activity over time.
 - [Web terminals](administration/integration/terminal.md): Provide terminal access to environments from within GitLab.
 - **(EES/EEP)** [Audit logs and events](administration/audit_events.md): View the changes made within the GitLab server.
 - **(EES/EEP)** [Elasticsearch](integration/elasticsearch.md): A flexible, scalable and powerful search service to keep GitLab's search fast when dealing with huge amount of data.
@@ -207,32 +168,16 @@ have access to GitLab administration tools and settings.
 - **(EES/EEP)** [Database load balancing](administration/database_load_balancing.md): Distribute database queries among multiple database servers.
 - **(EES/EEP)** [Omnibus support for external MySQL DB](https://docs.gitlab.com/omnibus/settings/database.html#using-a-mysql-database-management-server-enterprise-edition-only): Omnibus package supports configuring an external MySQL database.
 - **(EES/EEP)** [Omnibus support for log forwarding](https://docs.gitlab.com/omnibus/settings/logs.html#udp-log-shipping-gitlab-enterprise-edition-only)
- GitLab CI
-    - [CI admin settings](user/admin_area/settings/continuous_integration.md): Define max artifacts size and expiration.
-=======
-### GitLab admins' superpowers
- [Container Registry](administration/container_registry.md): Configure Docker Registry with GitLab.
- [Custom Git hooks](administration/custom_hooks.md): Custom Git hooks (on the filesystem) for when webhooks aren't enough.
- [Git LFS configuration](workflow/lfs/lfs_administration.md): Learn how to use LFS under GitLab.
- [GitLab Pages configuration](administration/pages/index.md): Configure GitLab Pages.
- [High Availability](administration/high_availability/README.md): Configure multiple servers for scaling or high availability.
- [User cohorts](user/admin_area/user_cohorts.md) View user activity over time.
- [Web terminals](administration/integration/terminal.md): Provide terminal access to environments from within GitLab.
 - GitLab CI
    - [CI admin settings](user/admin_area/settings/continuous_integration.md): Define max artifacts size and expiration time.
->>>>>>> ce/master
 ### Integrations
 - [Integrations](integration/README.md): How to integrate with systems such as JIRA, Redmine, Twitter.
 - [Koding](administration/integration/koding.md): Set up Koding to use with GitLab.
 - [Mattermost](user/project/integrations/mattermost.md): Set up GitLab with Mattermost.
-<<<<<<< HEAD
 - **(EES/EEP)** [Jenkins](integration/jenkins.md): Set up GitLab with Jenkins.
-=======
->>>>>>> ce/master
 ### Monitoring
@@ -244,11 +189,7 @@ have access to GitLab administration tools and settings.
 - [Housekeeping](administration/housekeeping.md): Keep your Git repository tidy and fast.
 - [Operations](administration/operations.md): Keeping GitLab up and running.
-<<<<<<< HEAD
- [Polling](administration/polling.md): Configure how often the GitLab UI polls for updates
-=======
 - [Polling](administration/polling.md): Configure how often the GitLab UI polls for updates.
->>>>>>> ce/master
 - [Request Profiling](administration/monitoring/performance/request_profiling.md): Get a detailed profile on slow requests.
 ### Customization

--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -420,7 +420,6 @@ describe ProjectsController do
    end
  end
-<<<<<<< HEAD
  describe 'GET edit' do
    it 'does not allow an auditor user to access the page' do
      sign_in(create(:user, :auditor))
@@ -440,7 +439,9 @@ describe ProjectsController do
          id: project.path
      expect(response).to have_http_status(200)
-=======
+    end
+  end
  describe 'POST #preview_markdown' do
    it 'renders json in a correct format' do
      sign_in(user)
@@ -448,7 +449,6 @@ describe ProjectsController do
      post :preview_markdown, namespace_id: public_project.namespace, id: public_project, text: '*Markdown* text'
      expect(JSON.parse(response.body).keys).to match_array(%w(body references))
->>>>>>> ce/master
    end
  end
 end
--- a/spec/features/projects/milestones/milestone_spec.rb
+++ b/spec/features/projects/milestones/milestone_spec.rb
@@ -64,7 +64,6 @@ feature 'Project milestone', :feature do
    end
  end
-<<<<<<< HEAD
  # EE-only
  context 'milestone summary' do
    it 'shows the total weight when sum is greater than zero' do
@@ -94,7 +93,7 @@ feature 'Project milestone', :feature do
  def milestone_path
    namespace_project_milestone_path(project.namespace, project, milestone)
  end
-=======
  context 'when project has an issue' do
    before do
      create(:issue, project: project, milestone: milestone)
@@ -113,10 +112,9 @@ feature 'Project milestone', :feature do
        aggregate_failures 'MR and issue blocks' do
          expect(blocks[3]).to have_content 1
-          expect(blocks[4]).to have_content 0
+          expect(blocks[5]).to have_content 0
        end
      end
    end
  end
->>>>>>> ce/master
 end