Skip to content

G
gitlab-ce
Commit f7123ed1 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Fix some conflicts 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 183ca39c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 148 deletions
app/models/ci/build.rb
View file @ f7123ed1
...@@ -236,7 +236,6 @@ module Ci ...@@ -236,7 +236,6 @@ module Ci
def has_trace? def has_trace?
trace.exist? trace.exist?
<<<<<<< HEAD
end end
def trace=(data) def trace=(data)
...@@ -247,18 +246,6 @@ module Ci ...@@ -247,18 +246,6 @@ module Ci
read_attribute(:trace) read_attribute(:trace)
end end
=======
end
def trace=(data)
raise NotImplementedError
end
def old_trace
read_attribute(:trace)
end
>>>>>>> origin/master
def erase_old_trace! def erase_old_trace!
write_attribute(:trace, nil) write_attribute(:trace, nil)
save save
......
app/views/shared/_clone_panel.html.haml
View file @ f7123ed1
...@@ -23,10 +23,7 @@ ...@@ -23,10 +23,7 @@
= text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true
.input-group-btn .input-group-btn
= clipboard_button(target: '#project_clone', title: "Copy URL to clipboard") = clipboard_button(target: '#project_clone', title: "Copy URL to clipboard")
<<<<<<< HEAD
=======
>>>>>>> origin/master
= geo_button(modal_target: '#modal-geo-info') if Gitlab::Geo.secondary? = geo_button(modal_target: '#modal-geo-info') if Gitlab::Geo.secondary?
:javascript :javascript
......
db/schema.rb
View file @ f7123ed1
...@@ -11,11 +11,7 @@ ...@@ -11,11 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
<<<<<<< HEAD
ActiveRecord::Schema.define(version: 20170406115029) do
=======
ActiveRecord::Schema.define(version: 20170407140450) do ActiveRecord::Schema.define(version: 20170407140450) do
>>>>>>> origin/master
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
......
doc/api/issues.md
View file @ f7123ed1
...@@ -112,11 +112,7 @@ GET /groups/:id/issues?search=issue+title+or+description ...@@ -112,11 +112,7 @@ GET /groups/:id/issues?search=issue+title+or+description
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------|----------------|----------|-----------------------------------------------------------------------------------------------------------------------------| |-------------|----------------|----------|-----------------------------------------------------------------------------------------------------------------------------|
<<<<<<< HEAD | `id` | integer/string | yes | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user |
| `id` | integer | yes | The ID of a group |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `state` | string | no | Return all issues or just those that are `opened` or `closed` | | `state` | string | no | Return all issues or just those that are `opened` or `closed` |
| `labels` | string | no | Comma-separated list of label names, issues must have all labels to be returned. `No+Label` lists all issues with no labels | | `labels` | string | no | Comma-separated list of label names, issues must have all labels to be returned. `No+Label` lists all issues with no labels |
| `iids` | Array[integer] | no | Return only the issues having the given `iid` | | `iids` | Array[integer] | no | Return only the issues having the given `iid` |
...@@ -199,11 +195,7 @@ GET /projects/:id/issues?search=issue+title+or+description ...@@ -199,11 +195,7 @@ GET /projects/:id/issues?search=issue+title+or+description
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------|----------------|----------|-----------------------------------------------------------------------------------------------------------------------------| |-------------|----------------|----------|-----------------------------------------------------------------------------------------------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `iids` | Array[integer] | no | Return only the milestone having the given `iid` | | `iids` | Array[integer] | no | Return only the milestone having the given `iid` |
| `state` | string | no | Return all issues or just those that are `opened` or `closed` | | `state` | string | no | Return all issues or just those that are `opened` or `closed` |
| `labels` | string | no | Comma-separated list of label names, issues must have all labels to be returned. `No+Label` lists all issues with no labels | | `labels` | string | no | Comma-separated list of label names, issues must have all labels to be returned. `No+Label` lists all issues with no labels |
...@@ -277,11 +269,7 @@ GET /projects/:id/issues/:issue_iid ...@@ -277,11 +269,7 @@ GET /projects/:id/issues/:issue_iid
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------|---------|----------|--------------------------------------| |-------------|---------|----------|--------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
```bash ```bash
...@@ -409,11 +397,7 @@ PUT /projects/:id/issues/:issue_iid ...@@ -409,11 +397,7 @@ PUT /projects/:id/issues/:issue_iid
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|----------------|---------|----------|------------------------------------------------------------------------------------------------------------| |----------------|---------|----------|------------------------------------------------------------------------------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
| `title` | string | no | The title of an issue | | `title` | string | no | The title of an issue |
| `description` | string | no | The description of an issue | | `description` | string | no | The description of an issue |
...@@ -474,11 +458,7 @@ DELETE /projects/:id/issues/:issue_iid ...@@ -474,11 +458,7 @@ DELETE /projects/:id/issues/:issue_iid
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------|---------|----------|--------------------------------------| |-------------|---------|----------|--------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
```bash ```bash
...@@ -500,11 +480,7 @@ POST /projects/:id/issues/:issue_iid/move ...@@ -500,11 +480,7 @@ POST /projects/:id/issues/:issue_iid/move
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-----------------|---------|----------|--------------------------------------| |-----------------|---------|----------|--------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
| `to_project_id` | integer | yes | The ID of the new project | | `to_project_id` | integer | yes | The ID of the new project |
...@@ -561,11 +537,7 @@ POST /projects/:id/issues/:issue_iid/subscribe ...@@ -561,11 +537,7 @@ POST /projects/:id/issues/:issue_iid/subscribe
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------|---------|----------|--------------------------------------| |-------------|---------|----------|--------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
```bash ```bash
...@@ -621,11 +593,7 @@ POST /projects/:id/issues/:issue_iid/unsubscribe ...@@ -621,11 +593,7 @@ POST /projects/:id/issues/:issue_iid/unsubscribe
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------|---------|----------|--------------------------------------| |-------------|---------|----------|--------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
```bash ```bash
...@@ -644,11 +612,7 @@ POST /projects/:id/issues/:issue_iid/todo ...@@ -644,11 +612,7 @@ POST /projects/:id/issues/:issue_iid/todo
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------|---------|----------|--------------------------------------| |-------------|---------|----------|--------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
```bash ```bash
...@@ -740,11 +704,7 @@ POST /projects/:id/issues/:issue_iid/time_estimate ...@@ -740,11 +704,7 @@ POST /projects/:id/issues/:issue_iid/time_estimate
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------|---------|----------|------------------------------------------| |-------------|---------|----------|------------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
| `duration` | string | yes | The duration in human format. e.g: 3h30m | | `duration` | string | yes | The duration in human format. e.g: 3h30m |
...@@ -773,11 +733,7 @@ POST /projects/:id/issues/:issue_iid/reset_time_estimate ...@@ -773,11 +733,7 @@ POST /projects/:id/issues/:issue_iid/reset_time_estimate
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------|---------|----------|--------------------------------------| |-------------|---------|----------|--------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
```bash ```bash
...@@ -805,11 +761,7 @@ POST /projects/:id/issues/:issue_iid/add_spent_time ...@@ -805,11 +761,7 @@ POST /projects/:id/issues/:issue_iid/add_spent_time
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------|---------|----------|------------------------------------------| |-------------|---------|----------|------------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
| `duration` | string | yes | The duration in human format. e.g: 3h30m | | `duration` | string | yes | The duration in human format. e.g: 3h30m |
...@@ -838,11 +790,7 @@ POST /projects/:id/issues/:issue_iid/reset_spent_time ...@@ -838,11 +790,7 @@ POST /projects/:id/issues/:issue_iid/reset_spent_time
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------|---------|----------|--------------------------------------| |-------------|---------|----------|--------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
```bash ```bash
...@@ -868,11 +816,7 @@ GET /projects/:id/issues/:issue_iid/time_stats ...@@ -868,11 +816,7 @@ GET /projects/:id/issues/:issue_iid/time_stats
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|-------------|---------|----------|--------------------------------------| |-------------|---------|----------|--------------------------------------|
<<<<<<< HEAD
| `id` | integer | yes | The ID of a project |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> origin/master
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
```bash ```bash
......
spec/models/ci/build_spec.rb
View file @ f7123ed1
...@@ -250,7 +250,6 @@ describe Ci::Build, :models do ...@@ -250,7 +250,6 @@ describe Ci::Build, :models do
before do before do
build.coverage_regex = '\(\d+.\d+\%\) covered' build.coverage_regex = '\(\d+.\d+\%\) covered'
build.trace.set('Coverage 1033 / 1051 LOC (98.29%) covered') build.trace.set('Coverage 1033 / 1051 LOC (98.29%) covered')
<<<<<<< HEAD
end end
it "saves the correct extracted coverage value" do it "saves the correct extracted coverage value" do
...@@ -319,76 +318,6 @@ describe Ci::Build, :models do ...@@ -319,76 +318,6 @@ describe Ci::Build, :models do
build.project.update(runners_token: 'token') build.project.update(runners_token: 'token')
end end
=======
end
it "saves the correct extracted coverage value" do
expect(build.update_coverage).to be(true)
expect(build.coverage).to eq(98.29)
end
end
end
describe '#trace' do
subject { build.trace }
it { is_expected.to be_a(Gitlab::Ci::Trace) }
end
describe '#has_trace?' do
subject { build.has_trace? }
it "expect to call exist? method" do
expect_any_instance_of(Gitlab::Ci::Trace).to receive(:exist?)
.and_return(true)
is_expected.to be(true)
end
end
describe '#trace=' do
it "expect to fail trace=" do
expect { build.trace = "new" }.to raise_error(NotImplementedError)
end
end
describe '#old_trace' do
subject { build.old_trace }
before do
build.update_column(:trace, 'old trace')
end
it "expect to receive data from database" do
is_expected.to eq('old trace')
end
end
describe '#erase_old_trace!' do
subject { build.send(:read_attribute, :trace) }
before do
build.send(:write_attribute, :trace, 'old trace')
end
it "expect to receive data from database" do
build.erase_old_trace!
is_expected.to be_nil
end
end
describe '#hide_secrets' do
let(:subject) { build.hide_secrets(data) }
context 'hide runners token' do
let(:data) { 'new token data'}
before do
build.project.update(runners_token: 'token')
end
>>>>>>> origin/master
it { is_expected.to eq('new xxxxx data') } it { is_expected.to eq('new xxxxx data') }
end end
......
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