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
d25ada92
Commit
d25ada92
authored
Nov 27, 2018
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve db/schema.rb
parent
c5366f34
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
7 deletions
+0
-7
db/schema.rb
db/schema.rb
+0
-7
No files found.
db/schema.rb
View file @
d25ada92
...
...
@@ -2577,11 +2577,6 @@ ActiveRecord::Schema.define(version: 20181126153547) do
t
.
index
[
"name"
],
name:
"index_shards_on_name"
,
unique:
true
,
using: :btree
end
<<<<<<<
.
merge_file_BDkhIJ
create_table
"site_statistics"
,
force: :cascade
do
|
t
|
t
.
integer
"repositories_count"
,
default:
0
,
null:
false
end
create_table
"slack_integrations"
,
force: :cascade
do
|
t
|
t
.
integer
"service_id"
,
null:
false
t
.
string
"team_id"
,
null:
false
...
...
@@ -2602,8 +2597,6 @@ ActiveRecord::Schema.define(version: 20181126153547) do
t
.
index
[
"user_id"
],
name:
"index_smartcard_identities_on_user_id"
,
using: :btree
end
=======
>>>>>>>
.
merge_file_fNGHHa
create_table
"snippets"
,
force: :cascade
do
|
t
|
t
.
string
"title"
t
.
text
"content"
...
...
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