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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
16cffa97
Commit
16cffa97
authored
Aug 07, 2017
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move locked_at removal to post-deployment migration
parent
0640b3d1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
app/models/merge_request.rb
app/models/merge_request.rb
+1
-0
db/post_migrate/20170807160457_remove_locked_at_column_from_merge_requests.rb
...0807160457_remove_locked_at_column_from_merge_requests.rb
+1
-1
db/schema.rb
db/schema.rb
+1
-1
No files found.
app/models/merge_request.rb
View file @
16cffa97
...
@@ -8,6 +8,7 @@ class MergeRequest < ActiveRecord::Base
...
@@ -8,6 +8,7 @@ class MergeRequest < ActiveRecord::Base
include
CreatedAtFilterable
include
CreatedAtFilterable
ignore_column
:position
ignore_column
:position
ignore_column
:locked_at
belongs_to
:target_project
,
class_name:
"Project"
belongs_to
:target_project
,
class_name:
"Project"
belongs_to
:source_project
,
class_name:
"Project"
belongs_to
:source_project
,
class_name:
"Project"
...
...
db/
migrate/20170801000000
_remove_locked_at_column_from_merge_requests.rb
→
db/
post_migrate/20170807160457
_remove_locked_at_column_from_merge_requests.rb
View file @
16cffa97
...
@@ -6,6 +6,6 @@ class RemoveLockedAtColumnFromMergeRequests < ActiveRecord::Migration
...
@@ -6,6 +6,6 @@ class RemoveLockedAtColumnFromMergeRequests < ActiveRecord::Migration
end
end
def
down
def
down
add_column
:merge_requests
,
:locked_at
,
:datetime_with_timezone
# nothing to do to recover the values
end
end
end
end
db/schema.rb
View file @
16cffa97
...
@@ -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:
2017080
3130232
)
do
ActiveRecord
::
Schema
.
define
(
version:
2017080
7160457
)
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"
...
...
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