Commit 9429382f authored by Nick Thomas's avatar Nick Thomas

Resolve merge conflicts

parent 988c4510
......@@ -346,11 +346,8 @@ GEM
grpc (1.1.2)
google-protobuf (~> 3.1)
googleauth (~> 0.5.1)
<<<<<<< HEAD
gssapi (1.2.0)
ffi (>= 1.0.1)
=======
>>>>>>> ce/master
haml (4.0.7)
tilt
haml_lint (0.21.0)
......
......@@ -10,13 +10,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
before_action :module_enabled
before_action :merge_request, only: [
:edit, :update, :show, :diffs, :commits, :conflicts, :conflict_for_path, :pipelines, :merge, :merge_check,
<<<<<<< HEAD
:ci_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_pipeline_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues,
# EE
:approve, :approvals, :unapprove, :rebase
=======
:ci_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_pipeline_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues
>>>>>>> ce/master
]
before_action :validates_merge_request, only: [:show, :diffs, :commits, :pipelines]
before_action :define_show_vars, only: [:show, :diffs, :commits, :conflicts, :conflict_for_path, :builds, :pipelines]
......
......@@ -22,12 +22,9 @@ class Project < ActiveRecord::Base
extend Gitlab::ConfigHelper
<<<<<<< HEAD
=======
BoardLimitExceeded = Class.new(StandardError)
NUMBER_OF_PERMITTED_BOARDS = 1
>>>>>>> ce/master
UNKNOWN_IMPORT_URL = 'http://unknown.git'.freeze
cache_markdown_field :description, pipeline: :description
......
......@@ -8,11 +8,8 @@ class MergeRequestEntity < IssuableEntity
expose :merge_status
expose :merge_user_id
expose :merge_when_pipeline_succeeds
<<<<<<< HEAD
expose :rebase_commit_sha
expose :rebase_in_progress?, if: { type: :full }
=======
>>>>>>> ce/master
expose :source_branch
expose :source_project_id
expose :target_branch
......
......@@ -79,7 +79,6 @@ module MergeRequests
end
end
<<<<<<< HEAD
# Note: Closed merge requests also need approvals reset.
def reset_approvals_for_merge_requests
merge_requests = merge_requests_for(@branch_name, mr_states: [:opened, :reopened, :closed])
......@@ -96,8 +95,6 @@ module MergeRequests
end
end
=======
>>>>>>> ce/master
def reset_merge_when_pipeline_succeeds
merge_requests_for_source_branch.each(&:reset_merge_when_pipeline_succeeds)
end
......
......@@ -104,7 +104,6 @@ class TodoService
def merge_request_build_failed(merge_request)
create_build_failed_todo(merge_request, merge_request.author)
create_build_failed_todo(merge_request, merge_request.merge_user) if merge_request.merge_when_pipeline_succeeds?
<<<<<<< HEAD
end
# When new approvers are added for a merge request:
......@@ -113,8 +112,6 @@ class TodoService
#
def add_merge_request_approvers(merge_request, approvers)
create_approval_required_todos(merge_request, approvers, merge_request.author)
=======
>>>>>>> ce/master
end
# When a new commit is pushed to a merge request we should:
......@@ -134,7 +131,7 @@ class TodoService
mark_pending_todos_as_done(merge_request, merge_request.author)
mark_pending_todos_as_done(merge_request, merge_request.merge_user) if merge_request.merge_when_pipeline_succeeds?
end
# When a merge request could not be automatically merged due to its unmergeable state we should:
#
# * create a todo for a merge_user
......@@ -142,7 +139,7 @@ class TodoService
def merge_request_became_unmergeable(merge_request)
create_unmergeable_todo(merge_request, merge_request.merge_user) if merge_request.merge_when_pipeline_succeeds?
end
# When create a note we should:
#
# * mark all pending todos related to the noteable for the note author as done
......
......@@ -19,12 +19,8 @@
tree_join(@commit.sha, @path)), class: 'btn btn-sm js-data-file-blob-permalink-url'
- if current_user
<<<<<<< HEAD
.btn-group{ role: "group" }
= lock_file_link(html_options: {class: 'btn btn-sm path-lock'})
=======
.btn-group{ role: "group" }<
>>>>>>> ce/master
= lock_file_link(html_options: {class: 'btn btn-sm path-lock'})
- if blob_text_viewable?(@blob)
= edit_blob_link
= replace_blob_link
......
......@@ -5,12 +5,9 @@
- when :merge_when_pipeline_succeeds
:plain
$('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/merge_when_pipeline_succeeds'))}");
<<<<<<< HEAD
- when :hook_validation_error
:plain
$('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/error'))}");
=======
>>>>>>> ce/master
- when :sha_mismatch
:plain
$('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/sha_mismatch'))}");
......
......@@ -11,17 +11,10 @@
.accept-action
- if @pipeline && @pipeline.active?
%span.btn-group
<<<<<<< HEAD
= button_tag class: "btn btn-create js-merge-button merge_when_pipeline_succeeds", disabled: !@merge_request.approved?, ":disabled" => "disableAcceptance" do
Merge When Pipeline Succeeds
- unless @project.only_allow_merge_if_pipeline_succeeds?
= button_tag class: "btn btn-success dropdown-toggle", 'data-toggle' => 'dropdown', disabled: !@merge_request.approved?, ":disabled" => "disableAcceptance" do
=======
= button_tag class: "btn btn-create js-merge-button merge_when_pipeline_succeeds" do
Merge When Pipeline Succeeds
- unless @project.only_allow_merge_if_pipeline_succeeds?
= button_tag class: "btn btn-success dropdown-toggle", 'data-toggle' => 'dropdown' do
>>>>>>> ce/master
= icon('caret-down')
%span.sr-only
Select Merge Moment
......
---
title: Remove the newrelic gem
<<<<<<< HEAD
merge_request: 1335
=======
merge_request: 9622
>>>>>>> ce/master
author: Robert Schilling
......@@ -107,8 +107,6 @@ DELETE /projects/:id/environments/:environment_id
```bash
curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v4/projects/1/environments/1"
<<<<<<< HEAD
=======
```
## Stop an environment
......@@ -137,5 +135,4 @@ Example response:
"slug": "deploy",
"external_url": "https://deploy.example.gitlab.com"
}
>>>>>>> ce/master
```
......@@ -480,23 +480,7 @@ Parameters:
- `merge_commit_message` (optional) - Custom merge commit message
- `should_remove_source_branch` (optional) - if `true` removes the source branch
- `merge_when_pipeline_succeeds` (optional) - if `true` the MR is merged when the pipeline succeeds
<<<<<<< HEAD
- `sha` (optional) - if present, then this SHA must
| Attribute | Type | Required | Description |
| --------- | ---- | -------- | ----------- |
| `id` | string | yes | The ID of a project |
| `merge_request_id` | integer | yes | The ID of the merge request |
| `merge_commit_message` | string | no | Custom merge commit message |
| `should_remove_source_branch` | boolean | no | Remove the source branch after merge |
| `merge_when_pipeline_succeeds` | boolean | no | Merge when pipeline succeeds, rather than immediately |
| `sha` | string | no | If present, then this SHA must match the HEAD of the source branch, otherwise the merge will fail |
| `squash` | boolean | no | Squash the merge request into a single commit |
=======
- `sha` (optional) - if present, then this SHA must match the HEAD of the source branch, otherwise the merge will fail
>>>>>>> ce/master
```json
{
......
......@@ -241,10 +241,7 @@ Parameters:
"group_access_level": 10
}
],
<<<<<<< HEAD
"repository_storage": "default",
=======
>>>>>>> ce/master
"only_allow_merge_if_pipeline_succeeds": false,
"only_allow_merge_if_all_discussions_are_resolved": false,
"request_access_enabled": false
......
......@@ -111,10 +111,7 @@ module API
SharedGroup.represent(project.project_group_links.all, options)
end
expose :only_allow_merge_if_pipeline_succeeds
<<<<<<< HEAD
expose :repository_storage, if: lambda { |_project, options| options[:current_user].try(:admin?) }
=======
>>>>>>> ce/master
expose :request_access_enabled
expose :only_allow_merge_if_all_discussions_are_resolved
expose :approvals_before_merge
......
......@@ -46,7 +46,6 @@ module API
expose :awardable_id, :awardable_type
end
<<<<<<< HEAD
class ApplicationSetting < Grape::Entity
expose :id
expose :default_projects_limit
......@@ -80,8 +79,6 @@ module API
expose :terminal_max_session_time
end
=======
>>>>>>> ce/master
class Project < Grape::Entity
expose :id, :description, :default_branch, :tag_list
expose :public?, as: :public
......@@ -114,15 +111,10 @@ module API
::API::Entities::SharedGroup.represent(project.project_group_links.all, options)
end
expose :only_allow_merge_if_pipeline_succeeds, as: :only_allow_merge_if_build_succeeds
<<<<<<< HEAD
expose :repository_storage, if: lambda { |_project, options| options[:current_user].try(:admin?) }
expose :request_access_enabled
expose :only_allow_merge_if_all_discussions_are_resolved
expose :approvals_before_merge
=======
expose :request_access_enabled
expose :only_allow_merge_if_all_discussions_are_resolved
>>>>>>> ce/master
expose :statistics, using: 'API::Entities::ProjectStatistics', if: :statistics
end
......@@ -157,7 +149,6 @@ module API
expose :merge_status
expose :diff_head_sha, as: :sha
expose :merge_commit_sha
<<<<<<< HEAD
expose :subscribed do |merge_request, options|
merge_request.subscribed?(options[:current_user], options[:project])
......@@ -168,14 +159,6 @@ module API
expose :should_remove_source_branch?, as: :should_remove_source_branch
expose :force_remove_source_branch?, as: :force_remove_source_branch
expose :squash
=======
expose :subscribed do |merge_request, options|
merge_request.subscribed?(options[:current_user], options[:project])
end
expose :user_notes_count
expose :should_remove_source_branch?, as: :should_remove_source_branch
expose :force_remove_source_branch?, as: :force_remove_source_branch
>>>>>>> ce/master
expose :web_url do |merge_request, options|
Gitlab::UrlBuilder.build(merge_request)
......
......@@ -68,12 +68,7 @@ module API
end
merge_requests = merge_requests.reorder(params[:order_by] => params[:sort])
<<<<<<< HEAD
present paginate(merge_requests), with: ::API::Entities::MergeRequest, current_user: current_user, project: user_project
=======
present paginate(merge_requests), with: ::API::V3::Entities::MergeRequest, current_user: current_user, project: user_project
>>>>>>> ce/master
end
desc 'Create a merge request' do
......@@ -226,11 +221,7 @@ module API
present merge_request, with: ::API::V3::Entities::MergeRequest, current_user: current_user, project: user_project
end
<<<<<<< HEAD
desc 'Cancel merge if "Merge When Pipeline Succeeds" is enabled' do
=======
desc 'Cancel merge if "Merge When Build succeeds" is enabled' do
>>>>>>> ce/master
success ::API::V3::Entities::MergeRequest
end
post "#{path}/cancel_merge_when_build_succeeds" do
......
......@@ -70,10 +70,7 @@ describe MergeRequests::RefreshService, services: true do
it { expect(@merge_request.notes).not_to be_empty }
it { expect(@merge_request).to be_open }
<<<<<<< HEAD
it { expect(@merge_request.approvals).to be_empty }
=======
>>>>>>> ce/master
it { expect(@merge_request.merge_when_pipeline_succeeds).to be_falsey }
it { expect(@merge_request.diff_head_sha).to eq(@newrev) }
it { expect(@fork_merge_request).to be_open }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment