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
3176e298
Commit
3176e298
authored
Nov 18, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose stop_path for environment to not construct that in frontend
parent
b1f5af40
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
app/assets/javascripts/environments/components/environment_item.js.es6
...vascripts/environments/components/environment_item.js.es6
+1
-1
app/assets/javascripts/environments/components/environment_stop.js.es6
...vascripts/environments/components/environment_stop.js.es6
+1
-1
app/serializers/environment_entity.rb
app/serializers/environment_entity.rb
+7
-0
No files found.
app/assets/javascripts/environments/components/environment_item.js.es6
View file @
3176e298
...
@@ -475,7 +475,7 @@
...
@@ -475,7 +475,7 @@
<div v-if="isStoppable && canCreateDeployment"
<div v-if="isStoppable && canCreateDeployment"
class="inline js-stop-component-container">
class="inline js-stop-component-container">
<stop-component
<stop-component
:stop_url="model.
environment
_path">
:stop_url="model.
stop
_path">
</stop-component>
</stop-component>
</div>
</div>
...
...
app/assets/javascripts/environments/components/environment_stop.js.es6
View file @
3176e298
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
computed: {
computed: {
stopUrl() {
stopUrl() {
return
`${this.stop_url}/stop`
;
return
this.stop_url
;
},
},
},
},
...
...
app/serializers/environment_entity.rb
View file @
3176e298
...
@@ -16,5 +16,12 @@ class EnvironmentEntity < Grape::Entity
...
@@ -16,5 +16,12 @@ class EnvironmentEntity < Grape::Entity
environment
)
environment
)
end
end
expose
:stop_path
do
|
environment
|
stop_namespace_project_environment_path
(
environment
.
project
.
namespace
,
environment
.
project
,
environment
)
end
expose
:created_at
,
:updated_at
expose
:created_at
,
:updated_at
end
end
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