Skip to content

G
gitlab-ce
Commit a100cc52 authored by Nick Thomas's avatar Nick Thomas
Browse files
Options

Resolve merge conflicts

parent 6b1c707d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 28 deletions
app/assets/javascripts/merge_request_widget.js
View file @ a100cc52
...@@ -44,11 +44,8 @@ import MiniPipelineGraph from './mini_pipeline_graph_dropdown'; ...@@ -44,11 +44,8 @@ import MiniPipelineGraph from './mini_pipeline_graph_dropdown';
// pipeline_status_url - String, URL to use to get CI status for Favicon // pipeline_status_url - String, URL to use to get CI status for Favicon
// //
this.opts = opts; this.opts = opts;
<<<<<<< HEAD
=======
this.opts.pipeline_status_url = `${this.opts.pipeline_status_url}.json`; this.opts.pipeline_status_url = `${this.opts.pipeline_status_url}.json`;
this.$widgetBody = $('.mr-widget-body'); this.$widgetBody = $('.mr-widget-body');
>>>>>>> ce/master
$('#modal_merge_info').modal({ $('#modal_merge_info').modal({
show: false show: false
}); });
......
app/policies/group_policy.rb
View file @ a100cc52
...@@ -14,12 +14,8 @@ class GroupPolicy < BasePolicy ...@@ -14,12 +14,8 @@ class GroupPolicy < BasePolicy
can_read ||= globally_viewable can_read ||= globally_viewable
can_read ||= member can_read ||= member
can_read ||= @user.admin? can_read ||= @user.admin?
<<<<<<< HEAD
can_read ||= @user.auditor? can_read ||= @user.auditor?
can_read ||= GroupProjectsFinder.new(@subject).execute(@user).any?
=======
can_read ||= GroupProjectsFinder.new(group: @subject, current_user: @user).execute.any? can_read ||= GroupProjectsFinder.new(group: @subject, current_user: @user).execute.any?
>>>>>>> ce/master
can! :read_group if can_read can! :read_group if can_read
# Only group masters and group owners can create new projects # Only group masters and group owners can create new projects
......
doc/api/issues.md
View file @ a100cc52
...@@ -341,22 +341,6 @@ Creates a new project issue. ...@@ -341,22 +341,6 @@ Creates a new project issue.
POST /projects/:id/issues POST /projects/:id/issues
``` ```
<<<<<<< HEAD
| Attribute | Type | Required | Description |
| --------- | ---- | -------- | ----------- |
| `id` | integer | yes | The ID of a project |
| `title` | string | yes | The title of an issue |
| `description` | string | no | The description of an issue |
| `confidential` | boolean | no | Set an issue to be confidential. Default is `false`. |
| `assignee_id` | integer | no | The ID of a user to assign issue |
| `milestone_id` | integer | no | The ID of a milestone to assign issue |
| `labels` | string | no | Comma-separated label names for an issue |
| `created_at` | string | no | Date time string, ISO 8601 formatted, e.g. `2016-03-11T03:45:40Z` (requires admin or project owner rights) |
| `due_date` | string | no | Date time string in the format YEAR-MONTH-DAY, e.g. `2016-03-11` |
| `merge_request_to_resolve_discussions_of` | integer | no | The IID of a merge request in which to resolve all issues. This will fill the issue with a default description and mark all discussions as resolved. When passing a description or title, these values will take precedence over the default values. |
| `discussion_to_resolve` | string | no | The ID of a discussion to resolve. This will fill in the issue with a default description and mark the discussion as resolved. Use in combination with `merge_request_to_resolve_discussions_of`. |
| `weight` | integer | no | The weight of the issue in range 0 to 9 |
=======
|-------------------------------------------+---------+----------+------------------------------------------------------------------------------------------------------------------------------------------------------| |-------------------------------------------+---------+----------+------------------------------------------------------------------------------------------------------------------------------------------------------|
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------------------------------------+---------+----------+------------------------------------------------------------------------------------------------------------------------------------------------------| |-------------------------------------------+---------+----------+------------------------------------------------------------------------------------------------------------------------------------------------------|
...@@ -373,8 +357,8 @@ POST /projects/:id/issues ...@@ -373,8 +357,8 @@ POST /projects/:id/issues
| - | - | - | When passing a description or title, these values will take precedence over the default values. | | - | - | - | When passing a description or title, these values will take precedence over the default values. |
| `discussion_to_resolve` | string | no | The ID of a discussion to resolve. This will fill in the issue with a default description and mark the discussion | | `discussion_to_resolve` | string | no | The ID of a discussion to resolve. This will fill in the issue with a default description and mark the discussion |
| - | - | - | as resolved. Use in combination with `merge_request_to_resolve_discussions_of`. | | - | - | - | as resolved. Use in combination with `merge_request_to_resolve_discussions_of`. |
| `weight` | integer | no | The weight of the issue in range 0 to 9 |
|-------------------------------------------+---------+----------+------------------------------------------------------------------------------------------------------------------------------------------------------| |-------------------------------------------+---------+----------+------------------------------------------------------------------------------------------------------------------------------------------------------|
>>>>>>> ce/master
```bash ```bash
curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/4/issues?title=Issues%20with%20auth&labels=bug curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/4/issues?title=Issues%20with%20auth&labels=bug
...@@ -437,11 +421,8 @@ PUT /projects/:id/issues/:issue_iid ...@@ -437,11 +421,8 @@ PUT /projects/:id/issues/:issue_iid
| `state_event` | string | no | The state event of an issue. Set `close` to close the issue and `reopen` to reopen it | | `state_event` | string | no | The state event of an issue. Set `close` to close the issue and `reopen` to reopen it |
| `updated_at` | string | no | Date time string, ISO 8601 formatted, e.g. `2016-03-11T03:45:40Z` (requires admin or project owner rights) | | `updated_at` | string | no | Date time string, ISO 8601 formatted, e.g. `2016-03-11T03:45:40Z` (requires admin or project owner rights) |
| `due_date` | string | no | Date time string in the format YEAR-MONTH-DAY, e.g. `2016-03-11` | | `due_date` | string | no | Date time string in the format YEAR-MONTH-DAY, e.g. `2016-03-11` |
<<<<<<< HEAD | `weight` | integer | no | The weight of the issue in range 0 to 9 |
| `weight` | integer | no | The weight of the issue in range 0 to 9 |
=======
|----------------+---------+----------+------------------------------------------------------------------------------------------------------------| |----------------+---------+----------+------------------------------------------------------------------------------------------------------------|
>>>>>>> ce/master
```bash ```bash
curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/4/issues/85?state_event=close curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/4/issues/85?state_event=close
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7