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
30c88499
Commit
30c88499
authored
Apr 07, 2017
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'load-svg-in-js' into 'master'
Removes unused code See merge request !10456
parents
558cdc9f
41ff2e15
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
13 deletions
+1
-13
app/assets/javascripts/environments/folder/environments_folder_view.js
...vascripts/environments/folder/environments_folder_view.js
+0
-9
app/views/projects/environments/folder.html.haml
app/views/projects/environments/folder.html.haml
+1
-4
No files found.
app/assets/javascripts/environments/folder/environments_folder_view.js
View file @
30c88499
...
...
@@ -31,12 +31,6 @@ export default Vue.component('environment-folder-view', {
cssContainerClass
:
environmentsData
.
cssClass
,
canCreateDeployment
:
environmentsData
.
canCreateDeployment
,
canReadEnvironment
:
environmentsData
.
canReadEnvironment
,
// svgs
commitIconSvg
:
environmentsData
.
commitIconSvg
,
playIconSvg
:
environmentsData
.
playIconSvg
,
terminalIconSvg
:
environmentsData
.
terminalIconSvg
,
// Pagination Properties,
paginationInformation
:
{},
pageNumber
:
1
,
...
...
@@ -163,9 +157,6 @@ export default Vue.component('environment-folder-view', {
:environments="state.environments"
:can-create-deployment="canCreateDeploymentParsed"
:can-read-environment="canReadEnvironmentParsed"
:play-icon-svg="playIconSvg"
:terminal-icon-svg="terminalIconSvg"
:commit-icon-svg="commitIconSvg"
:service="service"/>
<table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
...
...
app/views/projects/environments/folder.html.haml
View file @
30c88499
...
...
@@ -8,7 +8,4 @@
#environments-folder-list-view
{
data:
{
"can-create-deployment"
=>
can?
(
current_user
,
:create_deployment
,
@project
).
to_s
,
"can-read-environment"
=>
can?
(
current_user
,
:read_environment
,
@project
).
to_s
,
"css-class"
=>
container_class
,
"commit-icon-svg"
=>
custom_icon
(
"icon_commit"
),
"terminal-icon-svg"
=>
custom_icon
(
"icon_terminal"
),
"play-icon-svg"
=>
custom_icon
(
"icon_play"
)
}
}
"css-class"
=>
container_class
}
}
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