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
Jérome Perrin
gitlab-ce
Commits
a898a2ab
Commit
a898a2ab
authored
Mar 06, 2018
by
Mike Greiling
Committed by
Clement Ho
Mar 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove common_vue bundle
parent
47e866b3
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
8 additions
and
31 deletions
+8
-31
app/assets/javascripts/commons/vue.js
app/assets/javascripts/commons/vue.js
+1
-0
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+0
-3
app/views/projects/cycle_analytics/show.html.haml
app/views/projects/cycle_analytics/show.html.haml
+0
-2
app/views/projects/environments/index.html.haml
app/views/projects/environments/index.html.haml
+0
-3
app/views/projects/issues/index.html.haml
app/views/projects/issues/index.html.haml
+0
-3
app/views/projects/merge_requests/index.html.haml
app/views/projects/merge_requests/index.html.haml
+0
-3
app/views/projects/pipelines/show.html.haml
app/views/projects/pipelines/show.html.haml
+0
-3
app/views/projects/registry/repositories/index.html.haml
app/views/projects/registry/repositories/index.html.haml
+0
-2
app/views/projects/settings/repository/show.html.haml
app/views/projects/settings/repository/show.html.haml
+0
-3
app/views/shared/boards/_show.html.haml
app/views/shared/boards/_show.html.haml
+0
-1
config/webpack.config.js
config/webpack.config.js
+0
-2
spec/javascripts/environments/environments_app_spec.js
spec/javascripts/environments/environments_app_spec.js
+7
-6
No files found.
app/assets/javascripts/commons/vue.js
View file @
a898a2ab
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
'
../vue_shared/vue_resource_interceptor
'
;
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
{
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
{
Vue
.
config
.
productionTip
=
false
;
Vue
.
config
.
productionTip
=
false
;
...
...
app/views/groups/issues.html.haml
View file @
a898a2ab
...
@@ -2,9 +2,6 @@
...
@@ -2,9 +2,6 @@
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
params
.
merge
(
rss_url_options
),
title:
"
#{
@group
.
name
}
issues"
)
=
auto_discovery_link_tag
(
:atom
,
params
.
merge
(
rss_url_options
),
title:
"
#{
@group
.
name
}
issues"
)
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'common_vue'
-
if
group_issues_count
(
state:
'all'
).
zero?
-
if
group_issues_count
(
state:
'all'
).
zero?
=
render
'shared/empty_states/issues'
,
project_select_button:
true
=
render
'shared/empty_states/issues'
,
project_select_button:
true
-
else
-
else
...
...
app/views/projects/cycle_analytics/show.html.haml
View file @
a898a2ab
-
@no_container
=
true
-
@no_container
=
true
-
page_title
"Cycle Analytics"
-
page_title
"Cycle Analytics"
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_vue'
)
#cycle-analytics
{
class:
container_class
,
"v-cloak"
=>
"true"
,
data:
{
request_path:
project_cycle_analytics_path
(
@project
)
}
}
#cycle-analytics
{
class:
container_class
,
"v-cloak"
=>
"true"
,
data:
{
request_path:
project_cycle_analytics_path
(
@project
)
}
}
-
if
@cycle_analytics_no_data
-
if
@cycle_analytics_no_data
...
...
app/views/projects/environments/index.html.haml
View file @
a898a2ab
...
@@ -2,9 +2,6 @@
...
@@ -2,9 +2,6 @@
-
page_title
"Environments"
-
page_title
"Environments"
-
add_to_breadcrumbs
(
"Pipelines"
,
project_pipelines_path
(
@project
))
-
add_to_breadcrumbs
(
"Pipelines"
,
project_pipelines_path
(
@project
))
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
"common_vue"
)
#environments-list-view
{
data:
{
environments_data:
environments_list_data
,
#environments-list-view
{
data:
{
environments_data:
environments_list_data
,
"can-create-deployment"
=>
can?
(
current_user
,
:create_deployment
,
@project
).
to_s
,
"can-create-deployment"
=>
can?
(
current_user
,
:create_deployment
,
@project
).
to_s
,
"can-read-environment"
=>
can?
(
current_user
,
:read_environment
,
@project
).
to_s
,
"can-read-environment"
=>
can?
(
current_user
,
:read_environment
,
@project
).
to_s
,
...
...
app/views/projects/issues/index.html.haml
View file @
a898a2ab
...
@@ -4,9 +4,6 @@
...
@@ -4,9 +4,6 @@
-
page_title
"Issues"
-
page_title
"Issues"
-
new_issue_email
=
@project
.
new_issuable_address
(
current_user
,
'issue'
)
-
new_issue_email
=
@project
.
new_issuable_address
(
current_user
,
'issue'
)
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'common_vue'
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
params
.
merge
(
rss_url_options
),
title:
"
#{
@project
.
name
}
issues"
)
=
auto_discovery_link_tag
(
:atom
,
params
.
merge
(
rss_url_options
),
title:
"
#{
@project
.
name
}
issues"
)
...
...
app/views/projects/merge_requests/index.html.haml
View file @
a898a2ab
...
@@ -6,9 +6,6 @@
...
@@ -6,9 +6,6 @@
-
page_title
"Merge Requests"
-
page_title
"Merge Requests"
-
new_merge_request_email
=
@project
.
new_issuable_address
(
current_user
,
'merge_request'
)
-
new_merge_request_email
=
@project
.
new_issuable_address
(
current_user
,
'merge_request'
)
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'common_vue'
%div
{
class:
container_class
}
%div
{
class:
container_class
}
=
render
'projects/last_push'
=
render
'projects/last_push'
...
...
app/views/projects/pipelines/show.html.haml
View file @
a898a2ab
...
@@ -10,6 +10,3 @@
...
@@ -10,6 +10,3 @@
=
render
"projects/pipelines/with_tabs"
,
pipeline:
@pipeline
=
render
"projects/pipelines/with_tabs"
,
pipeline:
@pipeline
.js-pipeline-details-vue
{
data:
{
endpoint:
project_pipeline_path
(
@project
,
@pipeline
,
format: :json
)
}
}
.js-pipeline-details-vue
{
data:
{
endpoint:
project_pipeline_path
(
@project
,
@pipeline
,
format: :json
)
}
}
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_vue'
)
app/views/projects/registry/repositories/index.html.haml
View file @
a898a2ab
...
@@ -14,8 +14,6 @@
...
@@ -14,8 +14,6 @@
.col-lg-12
.col-lg-12
#js-vue-registry-images
{
data:
{
endpoint:
project_container_registry_index_path
(
@project
,
format: :json
)
}
}
#js-vue-registry-images
{
data:
{
endpoint:
project_container_registry_index_path
(
@project
,
format: :json
)
}
}
=
webpack_bundle_tag
(
'common_vue'
)
.row.prepend-top-10
.row.prepend-top-10
.col-lg-12
.col-lg-12
.panel.panel-default
.panel.panel-default
...
...
app/views/projects/settings/repository/show.html.haml
View file @
a898a2ab
...
@@ -2,9 +2,6 @@
...
@@ -2,9 +2,6 @@
-
page_title
"Repository"
-
page_title
"Repository"
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_vue'
)
-# Protected branches & tags use a lot of nested partials.
-# Protected branches & tags use a lot of nested partials.
-# The shared parts of the views can be found in the `shared` directory.
-# The shared parts of the views can be found in the `shared` directory.
-# Those are used throughout the actual views. These `shared` views are then
-# Those are used throughout the actual views. These `shared` views are then
...
...
app/views/shared/boards/_show.html.haml
View file @
a898a2ab
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
-
page_title
"Boards"
-
page_title
"Boards"
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'common_vue'
-# haml-lint:disable InlineJavaScript
-# haml-lint:disable InlineJavaScript
%script
#js-board-template
{
type:
"text/x-template"
}=
render
"shared/boards/components/board"
%script
#js-board-template
{
type:
"text/x-template"
}=
render
"shared/boards/components/board"
...
...
config/webpack.config.js
View file @
a898a2ab
...
@@ -44,8 +44,6 @@ function generateEntries() {
...
@@ -44,8 +44,6 @@ function generateEntries() {
const
manualEntries
=
{
const
manualEntries
=
{
common
:
'
./commons/index.js
'
,
common
:
'
./commons/index.js
'
,
common_vue
:
'
./vue_shared/vue_resource_interceptor.js
'
,
locale
:
'
./locale/index.js
'
,
main
:
'
./main.js
'
,
main
:
'
./main.js
'
,
raven
:
'
./raven/index.js
'
,
raven
:
'
./raven/index.js
'
,
webpack_runtime
:
'
./webpack.js
'
,
webpack_runtime
:
'
./webpack.js
'
,
...
...
spec/javascripts/environments/environments_app_spec.js
View file @
a898a2ab
...
@@ -61,6 +61,7 @@ describe('Environment', () => {
...
@@ -61,6 +61,7 @@ describe('Environment', () => {
});
});
describe
(
'
with paginated environments
'
,
()
=>
{
describe
(
'
with paginated environments
'
,
()
=>
{
let
backupInterceptors
;
const
environmentsResponseInterceptor
=
(
request
,
next
)
=>
{
const
environmentsResponseInterceptor
=
(
request
,
next
)
=>
{
next
((
response
)
=>
{
next
((
response
)
=>
{
response
.
headers
.
set
(
'
X-nExt-pAge
'
,
'
2
'
);
response
.
headers
.
set
(
'
X-nExt-pAge
'
,
'
2
'
);
...
@@ -84,16 +85,16 @@ describe('Environment', () => {
...
@@ -84,16 +85,16 @@ describe('Environment', () => {
};
};
beforeEach
(()
=>
{
beforeEach
(()
=>
{
Vue
.
http
.
interceptors
.
push
(
environmentsResponseInterceptor
);
backupInterceptors
=
Vue
.
http
.
interceptors
;
Vue
.
http
.
interceptors
.
push
(
headersInterceptor
);
Vue
.
http
.
interceptors
=
[
environmentsResponseInterceptor
,
headersInterceptor
,
];
component
=
mountComponent
(
EnvironmentsComponent
,
mockData
);
component
=
mountComponent
(
EnvironmentsComponent
,
mockData
);
});
});
afterEach
(()
=>
{
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
=
backupInterceptors
;
Vue
.
http
.
interceptors
,
environmentsResponseInterceptor
,
);
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
headersInterceptor
);
});
});
it
(
'
should render a table with environments
'
,
(
done
)
=>
{
it
(
'
should render a table with environments
'
,
(
done
)
=>
{
...
...
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