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
720e52d9
Commit
720e52d9
authored
Jan 29, 2016
by
Rubén Dávila
Committed by
Robert Speicher
Feb 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add merge_commit_sha column to merge_requests.
parent
d7511a4b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
app/models/merge_request.rb
app/models/merge_request.rb
+1
-0
db/schema.rb
db/schema.rb
+1
-0
No files found.
app/models/merge_request.rb
View file @
720e52d9
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
# merge_params :text
# merge_params :text
# merge_when_build_succeeds :boolean default(FALSE), not null
# merge_when_build_succeeds :boolean default(FALSE), not null
# merge_user_id :integer
# merge_user_id :integer
# merge_commit_sha :string
#
#
require
Rails
.
root
.
join
(
"app/models/commit"
)
require
Rails
.
root
.
join
(
"app/models/commit"
)
...
...
db/schema.rb
View file @
720e52d9
...
@@ -525,6 +525,7 @@ ActiveRecord::Schema.define(version: 20160209130428) do
...
@@ -525,6 +525,7 @@ ActiveRecord::Schema.define(version: 20160209130428) do
t
.
text
"merge_params"
t
.
text
"merge_params"
t
.
boolean
"merge_when_build_succeeds"
,
default:
false
,
null:
false
t
.
boolean
"merge_when_build_succeeds"
,
default:
false
,
null:
false
t
.
integer
"merge_user_id"
t
.
integer
"merge_user_id"
t
.
string
"merge_commit_sha"
end
end
add_index
"merge_requests"
,
[
"assignee_id"
],
name:
"index_merge_requests_on_assignee_id"
,
using: :btree
add_index
"merge_requests"
,
[
"assignee_id"
],
name:
"index_merge_requests_on_assignee_id"
,
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