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
72f46277
Commit
72f46277
authored
Oct 23, 2020
by
Payton Burdette
Committed by
Miguel Rincon
Oct 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move status into bundle
Move status scss into a page bundle.
parent
daa59718
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
9 additions
and
1 deletion
+9
-1
app/assets/stylesheets/_page_specific_files.scss
app/assets/stylesheets/_page_specific_files.scss
+0
-1
app/assets/stylesheets/page_bundles/ci_status.scss
app/assets/stylesheets/page_bundles/ci_status.scss
+2
-0
app/views/projects/jobs/index.html.haml
app/views/projects/jobs/index.html.haml
+1
-0
app/views/projects/jobs/show.html.haml
app/views/projects/jobs/show.html.haml
+1
-0
app/views/projects/merge_requests/creations/new.html.haml
app/views/projects/merge_requests/creations/new.html.haml
+1
-0
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+1
-0
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+1
-0
app/views/projects/pipelines/show.html.haml
app/views/projects/pipelines/show.html.haml
+1
-0
config/application.rb
config/application.rb
+1
-0
No files found.
app/assets/stylesheets/_page_specific_files.scss
View file @
72f46277
...
...
@@ -39,7 +39,6 @@
@import
'./pages/settings'
;
@import
'./pages/settings_ci_cd'
;
@import
'./pages/sherlock'
;
@import
'./pages/status'
;
@import
'./pages/storage_quota'
;
@import
'./pages/tree'
;
@import
'./pages/trials'
;
...
...
app/assets/stylesheets/page
s/
status.scss
→
app/assets/stylesheets/page
_bundles/ci_
status.scss
View file @
72f46277
@import
'mixins_and_variables_and_functions'
;
.ci-status
{
padding
:
2px
7px
4px
;
border
:
1px
solid
$gray-darker
;
...
...
app/views/projects/jobs/index.html.haml
View file @
72f46277
-
page_title
_
(
"Jobs"
)
-
add_page_specific_style
'page_bundles/ci_status'
.top-area
-
build_path_proc
=
->
(
scope
)
{
project_jobs_path
(
@project
,
scope:
scope
)
}
...
...
app/views/projects/jobs/show.html.haml
View file @
72f46277
...
...
@@ -2,6 +2,7 @@
-
breadcrumb_title
"#
#{
@build
.
id
}
"
-
page_title
"
#{
@build
.
name
}
(#
#{
@build
.
id
}
)"
,
_
(
"Jobs"
)
-
add_page_specific_style
'page_bundles/xterm'
-
add_page_specific_style
'page_bundles/ci_status'
=
render_if_exists
"shared/shared_runners_minutes_limit_flash_message"
...
...
app/views/projects/merge_requests/creations/new.html.haml
View file @
72f46277
...
...
@@ -2,6 +2,7 @@
-
breadcrumb_title
_
(
"New"
)
-
page_title
_
(
"New Merge Request"
)
-
add_page_specific_style
'page_bundles/pipelines'
-
add_page_specific_style
'page_bundles/ci_status'
-
if
@merge_request
.
can_be_created
&&
!
params
[
:change_branches
]
=
render
'new_submit'
...
...
app/views/projects/merge_requests/show.html.haml
View file @
72f46277
...
...
@@ -11,6 +11,7 @@
-
add_page_specific_style
'page_bundles/merge_requests'
-
add_page_specific_style
'page_bundles/pipelines'
-
add_page_specific_style
'page_bundles/reports'
-
add_page_specific_style
'page_bundles/ci_status'
.merge-request
{
data:
{
mr_action:
mr_action
,
url:
merge_request_path
(
@merge_request
,
format: :json
),
project_path:
project_path
(
@merge_request
.
project
),
lock_version:
@merge_request
.
lock_version
}
}
=
render
"projects/merge_requests/mr_title"
...
...
app/views/projects/pipelines/index.html.haml
View file @
72f46277
-
page_title
_
(
'Pipelines'
)
-
add_page_specific_style
'page_bundles/pipelines'
-
add_page_specific_style
'page_bundles/ci_status'
=
render_if_exists
"shared/shared_runners_minutes_limit_flash_message"
...
...
app/views/projects/pipelines/show.html.haml
View file @
72f46277
...
...
@@ -4,6 +4,7 @@
-
pipeline_has_errors
=
@pipeline
.
builds
.
empty?
&&
@pipeline
.
yaml_errors
.
present?
-
add_page_specific_style
'page_bundles/pipeline'
-
add_page_specific_style
'page_bundles/reports'
-
add_page_specific_style
'page_bundles/ci_status'
.js-pipeline-container
{
data:
{
controller_action:
"#{controller.action_name}"
}
}
#js-pipeline-header-vue
.pipeline-header-container
{
data:
{
full_path:
@project
.
full_path
,
retry_path:
retry_project_pipeline_path
(
@pipeline
.
project
,
@pipeline
),
cancel_path:
cancel_project_pipeline_path
(
@pipeline
.
project
,
@pipeline
),
delete_path:
project_pipeline_path
(
@pipeline
.
project
,
@pipeline
),
pipeline_iid:
@pipeline
.
iid
,
pipeline_id:
@pipeline
.
id
}
}
...
...
config/application.rb
View file @
72f46277
...
...
@@ -175,6 +175,7 @@ module Gitlab
config
.
assets
.
precompile
<<
"mailers/*.css"
config
.
assets
.
precompile
<<
"page_bundles/_mixins_and_variables_and_functions.css"
config
.
assets
.
precompile
<<
"page_bundles/boards.css"
config
.
assets
.
precompile
<<
"page_bundles/ci_status.css"
config
.
assets
.
precompile
<<
"page_bundles/cycle_analytics.css"
config
.
assets
.
precompile
<<
"page_bundles/dev_ops_report.css"
config
.
assets
.
precompile
<<
"page_bundles/environments.css"
...
...
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