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
7a56693a
Commit
7a56693a
authored
Feb 19, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-rebase-checkbox' into 'master'
Fix rebase checkbox For #229 See merge request !320
parents
53a34b9c
c1f41a0f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
7 deletions
+2
-7
db/migrate/20150217001826_change_rebase_project_setting_to_false.rb
.../20150217001826_change_rebase_project_setting_to_false.rb
+0
-5
db/schema.rb
db/schema.rb
+2
-2
No files found.
db/migrate/20150217001826_change_rebase_project_setting_to_false.rb
deleted
100644 → 0
View file @
53a34b9c
class
ChangeRebaseProjectSettingToFalse
<
ActiveRecord
::
Migration
def
change
change_column
:projects
,
:merge_requests_rebase_default
,
:boolean
,
default:
false
end
end
db/schema.rb
View file @
7a56693a
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended that you check this file into your version control system.
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
2015021
7001826
)
do
ActiveRecord
::
Schema
.
define
(
version:
2015021
3121042
)
do
# These are extensions that must be enabled in order to support this database
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
enable_extension
"plpgsql"
...
@@ -398,7 +398,7 @@ ActiveRecord::Schema.define(version: 20150217001826) do
...
@@ -398,7 +398,7 @@ ActiveRecord::Schema.define(version: 20150217001826) do
t
.
boolean
"merge_requests_rebase_enabled"
,
default:
false
t
.
boolean
"merge_requests_rebase_enabled"
,
default:
false
t
.
string
"import_type"
t
.
string
"import_type"
t
.
string
"import_source"
t
.
string
"import_source"
t
.
boolean
"merge_requests_rebase_default"
,
default:
fals
e
t
.
boolean
"merge_requests_rebase_default"
,
default:
tru
e
end
end
add_index
"projects"
,
[
"created_at"
,
"id"
],
name:
"index_projects_on_created_at_and_id"
,
using: :btree
add_index
"projects"
,
[
"created_at"
,
"id"
],
name:
"index_projects_on_created_at_and_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