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
bb62a7bf
Commit
bb62a7bf
authored
Sep 19, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bad merge in app/models/environment.rb
parent
781eb463
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
app/models/environment.rb
app/models/environment.rb
+1
-3
No files found.
app/models/environment.rb
View file @
bb62a7bf
...
...
@@ -6,9 +6,7 @@ class Environment < ActiveRecord::Base
belongs_to
:project
,
required:
true
,
validate:
true
has_many
:deployments
,
->
(
env
)
{
where
(
project_id:
env
.
project_id
)
},
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
has_many
:deployments
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
has_one
:last_deployment
,
->
{
order
(
'deployments.id DESC'
)
},
class_name:
'Deployment'
...
...
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