Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
ef3c5d5d1d93
Commit
bd68e9ad
authored
Sep 29, 2017
by
Valery Sizov
Browse files
[Port semi-linear history from EE] Move migration to CE and `merge_method` method
parent
9a393ed452c1
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/models/project.rb
View file @
ef3c5d5d
...
...
@@ -1567,13 +1567,25 @@ def renamed?
def
merge_method
if
self
.
merge_requests_ff_only_enabled
:ff
elsif
self
.
merge_requests_rebase_enabled
:rebase_merge
else
:merge
end
end
def
merge_method
=
(
method
)
self
.
merge_requests_ff_only_enabled
=
method
.
to_s
==
"ff"
case
method
.
to_s
when
"ff"
self
.
merge_requests_ff_only_enabled
=
true
self
.
merge_requests_rebase_enabled
=
true
when
"rebase_merge"
self
.
merge_requests_ff_only_enabled
=
false
self
.
merge_requests_rebase_enabled
=
true
when
"merge"
self
.
merge_requests_ff_only_enabled
=
false
self
.
merge_requests_rebase_enabled
=
false
end
end
def
ff_merge_must_be_possible?
...
...
db/migrate/20141126120926_add_merge_request_rebase_enabled_to_projects.rb
0 → 100644
View file @
ef3c5d5d
# rubocop:disable all
class
AddMergeRequestRebaseEnabledToProjects
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
# Set this constant to true if this migration requires downtime.
DOWNTIME
=
false
disable_ddl_transaction!
def
up
add_column_with_default
(
:projects
,
:merge_requests_rebase_enabled
,
:boolean
,
default:
false
)
end
def
down
remove_column
(
:projects
,
:merge_requests_rebase_enabled
)
end
end
db/schema.rb
View file @
ef3c5d5d
...
...
@@ -1217,6 +1217,7 @@
t
.
boolean
"resolve_outdated_diff_discussions"
t
.
boolean
"repository_read_only"
t
.
boolean
"merge_requests_ff_only_enabled"
,
default:
false
t
.
boolean
"merge_requests_rebase_enabled"
,
default:
false
,
null:
false
end
add_index
"projects"
,
[
"ci_id"
],
name:
"index_projects_on_ci_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