Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
85da56a5
Commit
85da56a5
authored
Aug 01, 2018
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in `db/schema.rb`
parent
51fe2bdc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
13 deletions
+0
-13
db/schema.rb
db/schema.rb
+0
-13
No files found.
db/schema.rb
View file @
85da56a5
...
...
@@ -2363,19 +2363,13 @@ ActiveRecord::Schema.define(version: 20180726172057) do
t
.
integer
"action"
,
null:
false
t
.
integer
"issue_id"
t
.
integer
"merge_request_id"
<<<<<<<
HEAD
t
.
integer
"epic_id"
=======
>>>>>>>
upstream
/
master
t
.
integer
"label_id"
t
.
integer
"user_id"
t
.
datetime_with_timezone
"created_at"
,
null:
false
end
<<<<<<<
HEAD
add_index
"resource_label_events"
,
[
"epic_id"
],
name:
"index_resource_label_events_on_epic_id"
,
using: :btree
=======
>>>>>>>
upstream
/
master
add_index
"resource_label_events"
,
[
"issue_id"
],
name:
"index_resource_label_events_on_issue_id"
,
using: :btree
add_index
"resource_label_events"
,
[
"label_id"
],
name:
"index_resource_label_events_on_label_id"
,
using: :btree
add_index
"resource_label_events"
,
[
"merge_request_id"
],
name:
"index_resource_label_events_on_merge_request_id"
,
using: :btree
...
...
@@ -3055,20 +3049,13 @@ ActiveRecord::Schema.define(version: 20180726172057) do
add_foreign_key
"push_event_payloads"
,
"events"
,
name:
"fk_36c74129da"
,
on_delete: :cascade
add_foreign_key
"push_rules"
,
"projects"
,
name:
"fk_83b29894de"
,
on_delete: :cascade
add_foreign_key
"releases"
,
"projects"
,
name:
"fk_47fe2a0596"
,
on_delete: :cascade
<<<<<<<
HEAD
add_foreign_key
"remote_mirrors"
,
"projects"
,
name:
"fk_43a9aa4ca8"
,
on_delete: :cascade
add_foreign_key
"resource_label_events"
,
"epics"
,
on_delete: :cascade
=======
add_foreign_key
"remote_mirrors"
,
"projects"
,
on_delete: :cascade
>>>>>>>
upstream
/
master
add_foreign_key
"resource_label_events"
,
"issues"
,
on_delete: :cascade
add_foreign_key
"resource_label_events"
,
"labels"
,
on_delete: :nullify
add_foreign_key
"resource_label_events"
,
"merge_requests"
,
on_delete: :cascade
add_foreign_key
"resource_label_events"
,
"users"
,
on_delete: :nullify
<<<<<<<
HEAD
add_foreign_key
"saml_providers"
,
"namespaces"
,
column:
"group_id"
,
on_delete: :cascade
=======
>>>>>>>
upstream
/
master
add_foreign_key
"services"
,
"projects"
,
name:
"fk_71cce407f9"
,
on_delete: :cascade
add_foreign_key
"slack_integrations"
,
"services"
,
on_delete: :cascade
add_foreign_key
"snippets"
,
"projects"
,
name:
"fk_be41fd4bb7"
,
on_delete: :cascade
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment