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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
802087c9
Commit
802087c9
authored
10 years ago
by
Jeroen van Baarsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed default in the database for the statemachine
parent
c898dc00
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
app/models/merge_request_diff.rb
app/models/merge_request_diff.rb
+1
-1
db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb
...131055_change_state_to_allow_empty_merge_request_diffs.rb
+9
-0
db/schema.rb
db/schema.rb
+3
-3
No files found.
app/models/merge_request_diff.rb
View file @
802087c9
...
...
@@ -26,7 +26,7 @@ class MergeRequestDiff < ActiveRecord::Base
delegate
:target_branch
,
:source_branch
,
to: :merge_request
,
prefix:
nil
state_machine
:state
,
initial: :
collected
do
state_machine
:state
,
initial: :
empty
do
state
:collected
state
:timeout
state
:overflow_commits_safe_size
...
...
This diff is collapsed.
Click to expand it.
db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb
0 → 100644
View file @
802087c9
class
ChangeStateToAllowEmptyMergeRequestDiffs
<
ActiveRecord
::
Migration
def
up
change_column
:merge_request_diffs
,
:state
,
:string
,
null:
true
,
default:
nil
end
def
down
change_column
:merge_request_diffs
,
:state
,
:string
,
null:
false
,
default:
"collected"
end
end
This diff is collapsed.
Click to expand it.
db/schema.rb
View file @
802087c9
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
201404
07135544
)
do
ActiveRecord
::
Schema
.
define
(
version:
201404
14131055
)
do
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
...
...
@@ -109,7 +109,7 @@ ActiveRecord::Schema.define(version: 20140407135544) do
add_index
"keys"
,
[
"user_id"
],
name:
"index_keys_on_user_id"
,
using: :btree
create_table
"merge_request_diffs"
,
force:
true
do
|
t
|
t
.
string
"state"
,
default:
"collected"
,
null:
false
t
.
string
"state"
t
.
text
"st_commits"
t
.
text
"st_diffs"
t
.
integer
"merge_request_id"
,
null:
false
...
...
This diff is collapsed.
Click to expand it.
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