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
baebeb48
Commit
baebeb48
authored
Aug 27, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate projects with rebase feature enabled
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
971c6e8d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
3 deletions
+13
-3
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
db/migrate/20150827144737_migrate_rebase_feature.rb
db/migrate/20150827144737_migrate_rebase_feature.rb
+11
-0
db/schema.rb
db/schema.rb
+1
-2
No files found.
app/controllers/projects_controller.rb
View file @
baebeb48
...
...
@@ -194,7 +194,7 @@ class ProjectsController < ApplicationController
:name
,
:path
,
:description
,
:issues_tracker
,
:tag_list
,
:issues_enabled
,
:merge_requests_enabled
,
:snippets_enabled
,
:issues_tracker_id
,
:default_branch
,
:wiki_enabled
,
:merge_requests_template
,
:visibility_level
,
:merge_requests_rebase_enabled
,
:import_url
,
:last_activity_at
,
:namespace_id
,
:avatar
,
:merge_requests_rebase_default
,
:import_url
,
:last_activity_at
,
:namespace_id
,
:avatar
,
:approvals_before_merge
,
:approver_ids
,
:reset_approvals_on_push
,
:merge_requests_ff_only_enabled
)
end
...
...
db/migrate/20150827144737_migrate_rebase_feature.rb
0 → 100644
View file @
baebeb48
class
MigrateRebaseFeature
<
ActiveRecord
::
Migration
def
up
execute
%q{UPDATE projects SET merge_requests_ff_only_enabled = TRUE WHERE merge_requests_rebase_enabled IS TRUE}
remove_column
:projects
,
:merge_requests_rebase_default
end
def
down
add_column
:projects
,
:merge_requests_rebase_default
,
:boolean
,
default:
true
end
end
db/schema.rb
View file @
baebeb48
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
201508271
21444
)
do
ActiveRecord
::
Schema
.
define
(
version:
201508271
44737
)
do
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
...
...
@@ -464,7 +464,6 @@ ActiveRecord::Schema.define(version: 20150827121444) do
t
.
boolean
"merge_requests_rebase_enabled"
,
default:
false
t
.
string
"import_type"
t
.
string
"import_source"
t
.
boolean
"merge_requests_rebase_default"
,
default:
true
t
.
integer
"approvals_before_merge"
,
default:
0
,
null:
false
t
.
boolean
"reset_approvals_on_push"
,
default:
true
t
.
integer
"commit_count"
,
default:
0
...
...
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