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
Léo-Paul Géneau
gitlab-ce
Commits
44622abe
Commit
44622abe
authored
Feb 27, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes after review - adds alias for icons path
parent
70207088
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
24 additions
and
23 deletions
+24
-23
app/assets/javascripts/environments/components/environment_actions.js.es6
...cripts/environments/components/environment_actions.js.es6
+1
-1
app/assets/javascripts/environments/components/environment_terminal_button.js.es6
...nvironments/components/environment_terminal_button.js.es6
+1
-1
app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
.../issuable/time_tracking/components/collapsed_state.js.es6
+1
-1
app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
...s/javascripts/vue_pipelines_index/pipeline_actions.js.es6
+1
-1
app/assets/javascripts/vue_pipelines_index/stage.js.es6
app/assets/javascripts/vue_pipelines_index/stage.js.es6
+9
-9
app/assets/javascripts/vue_pipelines_index/status.js.es6
app/assets/javascripts/vue_pipelines_index/status.js.es6
+9
-9
app/assets/javascripts/vue_shared/components/commit.js.es6
app/assets/javascripts/vue_shared/components/commit.js.es6
+1
-1
config/webpack.config.js
config/webpack.config.js
+1
-0
No files found.
app/assets/javascripts/environments/components/environment_actions.js.es6
View file @
44622abe
const Vue = require('vue');
const playIconSvg = require('
../../../../views/shared/
icons/_icon_play.svg');
const playIconSvg = require('icons/_icon_play.svg');
module.exports = Vue.component('actions-component', {
props: {
...
...
app/assets/javascripts/environments/components/environment_terminal_button.js.es6
View file @
44622abe
...
...
@@ -3,7 +3,7 @@
* Used in environments table.
*/
const Vue = require('vue');
const terminalIconSvg = require('
../../../../views/shared/
icons/_icon_terminal.svg');
const terminalIconSvg = require('icons/_icon_terminal.svg');
module.exports = Vue.component('terminal-button-component', {
props: {
...
...
app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js.es6
View file @
44622abe
/* global Vue */
import stopwatchSvg from '
../../../../../views/shared/
icons/_icon_stopwatch.svg';
import stopwatchSvg from 'icons/_icon_stopwatch.svg';
require('../../../lib/utils/pretty_time');
...
...
app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
View file @
44622abe
/* global Vue, Flash, gl */
/* eslint-disable no-param-reassign, no-alert */
const playIconSvg = require('
../../../views/shared/
icons/_icon_play.svg');
const playIconSvg = require('icons/_icon_play.svg');
((gl) => {
gl.VuePipelineActions = Vue.extend({
...
...
app/assets/javascripts/vue_pipelines_index/stage.js.es6
View file @
44622abe
/* global Vue, Flash, gl */
/* eslint-disable no-param-reassign */
import canceledSvg from '
../../../views/shared/
icons/_icon_status_canceled_borderless.svg';
import createdSvg from '
../../../views/shared/
icons/_icon_status_created_borderless.svg';
import failedSvg from '
../../../views/shared/
icons/_icon_status_failed_borderless.svg';
import manualSvg from '
../../../views/shared/
icons/_icon_status_manual_borderless.svg';
import pendingSvg from '
../../../views/shared/
icons/_icon_status_pending_borderless.svg';
import runningSvg from '
../../../views/shared/
icons/_icon_status_running_borderless.svg';
import skippedSvg from '
../../../views/shared/
icons/_icon_status_skipped_borderless.svg';
import successSvg from '
../../../views/shared/
icons/_icon_status_success_borderless.svg';
import warningSvg from '
../../../views/shared/
icons/_icon_status_warning_borderless.svg';
import canceledSvg from 'icons/_icon_status_canceled_borderless.svg';
import createdSvg from 'icons/_icon_status_created_borderless.svg';
import failedSvg from 'icons/_icon_status_failed_borderless.svg';
import manualSvg from 'icons/_icon_status_manual_borderless.svg';
import pendingSvg from 'icons/_icon_status_pending_borderless.svg';
import runningSvg from 'icons/_icon_status_running_borderless.svg';
import skippedSvg from 'icons/_icon_status_skipped_borderless.svg';
import successSvg from 'icons/_icon_status_success_borderless.svg';
import warningSvg from 'icons/_icon_status_warning_borderless.svg';
((gl) => {
gl.VueStage = Vue.extend({
...
...
app/assets/javascripts/vue_pipelines_index/status.js.es6
View file @
44622abe
/* global Vue, gl */
/* eslint-disable no-param-reassign */
import canceledSvg from '
../../../views/shared/
icons/_icon_status_canceled.svg';
import createdSvg from '
../../../views/shared/
icons/_icon_status_created.svg';
import failedSvg from '
../../../views/shared/
icons/_icon_status_failed.svg';
import manualSvg from '
../../../views/shared/
icons/_icon_status_manual.svg';
import pendingSvg from '
../../../views/shared/
icons/_icon_status_pending.svg';
import runningSvg from '
../../../views/shared/
icons/_icon_status_running.svg';
import skippedSvg from '
../../../views/shared/
icons/_icon_status_skipped.svg';
import successSvg from '
../../../views/shared/
icons/_icon_status_success.svg';
import warningSvg from '
../../../views/shared/
icons/_icon_status_warning.svg';
import canceledSvg from 'icons/_icon_status_canceled.svg';
import createdSvg from 'icons/_icon_status_created.svg';
import failedSvg from 'icons/_icon_status_failed.svg';
import manualSvg from 'icons/_icon_status_manual.svg';
import pendingSvg from 'icons/_icon_status_pending.svg';
import runningSvg from 'icons/_icon_status_running.svg';
import skippedSvg from 'icons/_icon_status_skipped.svg';
import successSvg from 'icons/_icon_status_success.svg';
import warningSvg from 'icons/_icon_status_warning.svg';
((gl) => {
gl.VueStatusScope = Vue.extend({
...
...
app/assets/javascripts/vue_shared/components/commit.js.es6
View file @
44622abe
/* global Vue */
window.Vue = require('vue');
const commitIconSvg = require('
../../../../views/shared/
icons/_icon_commit.svg');
const commitIconSvg = require('icons/_icon_commit.svg');
(() => {
window.gl = window.gl || {};
...
...
config/webpack.config.js
View file @
44622abe
...
...
@@ -90,6 +90,7 @@ var config = {
'
~
'
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts
'
),
'
bootstrap/js
'
:
'
bootstrap-sass/assets/javascripts/bootstrap
'
,
'
emoji-aliases$
'
:
path
.
join
(
ROOT_PATH
,
'
fixtures/emojis/aliases.json
'
),
'
icons
'
:
path
.
join
(
ROOT_PATH
,
'
app/views/shared/icons
'
),
'
vendor
'
:
path
.
join
(
ROOT_PATH
,
'
vendor/assets/javascripts
'
),
'
vue$
'
:
IS_PRODUCTION
?
'
vue/dist/vue.min.js
'
:
'
vue/dist/vue.js
'
,
}
...
...
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