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
49b45fca
Commit
49b45fca
authored
Aug 15, 2018
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflict in db/schema.rb
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
6929e1c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
db/schema.rb
db/schema.rb
+1
-4
No files found.
db/schema.rb
View file @
49b45fca
...
@@ -214,7 +214,7 @@ ActiveRecord::Schema.define(version: 20180808162000) do
...
@@ -214,7 +214,7 @@ ActiveRecord::Schema.define(version: 20180808162000) do
t
.
string
"snowplow_cookie_domain"
t
.
string
"snowplow_cookie_domain"
t
.
boolean
"instance_statistics_visibility_private"
,
default:
false
,
null:
false
t
.
boolean
"instance_statistics_visibility_private"
,
default:
false
,
null:
false
t
.
boolean
"web_ide_clientside_preview_enabled"
,
default:
false
,
null:
false
t
.
boolean
"web_ide_clientside_preview_enabled"
,
default:
false
,
null:
false
<<<<<<<
HEAD
t
.
boolean
"user_show_add_ssh_key_message"
,
default:
true
,
null:
false
t
.
integer
"custom_project_templates_group_id"
t
.
integer
"custom_project_templates_group_id"
end
end
...
@@ -244,9 +244,6 @@ ActiveRecord::Schema.define(version: 20180808162000) do
...
@@ -244,9 +244,6 @@ ActiveRecord::Schema.define(version: 20180808162000) do
t
.
integer
"user_id"
,
null:
false
t
.
integer
"user_id"
,
null:
false
t
.
datetime
"created_at"
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
datetime
"updated_at"
=======
t
.
boolean
"user_show_add_ssh_key_message"
,
default:
true
,
null:
false
>>>>>>>
upstream
/
master
end
end
add_index
"approvers"
,
[
"target_id"
,
"target_type"
],
name:
"index_approvers_on_target_id_and_target_type"
,
using: :btree
add_index
"approvers"
,
[
"target_id"
,
"target_type"
],
name:
"index_approvers_on_target_id_and_target_type"
,
using: :btree
...
...
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