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
f2cb08e1
Commit
f2cb08e1
authored
May 29, 2018
by
Clement Ho
Committed by
Annabel Gray
May 29, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add bootstrap fixes that were in EE but were mismatching in CE
parent
0d32ec44
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/admin/application_settings/_signin.html.haml
app/views/admin/application_settings/_signin.html.haml
+1
-1
app/views/projects/jobs/_sidebar.html.haml
app/views/projects/jobs/_sidebar.html.haml
+2
-2
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
No files found.
app/views/admin/application_settings/_signin.html.haml
View file @
f2cb08e1
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
must be used to authenticate.
must be used to authenticate.
-
if
omniauth_enabled?
&&
button_based_providers
.
any?
-
if
omniauth_enabled?
&&
button_based_providers
.
any?
.form-group.row
.form-group.row
=
f
.
label
:enabled_oauth_sign_in_sources
,
'Enabled OAuth sign-in sources'
,
class:
'co
ntrol
-label col-sm-2'
=
f
.
label
:enabled_oauth_sign_in_sources
,
'Enabled OAuth sign-in sources'
,
class:
'co
l-form
-label col-sm-2'
=
hidden_field_tag
'application_setting[enabled_oauth_sign_in_sources][]'
=
hidden_field_tag
'application_setting[enabled_oauth_sign_in_sources][]'
.col-sm-10
.col-sm-10
.btn-group
{
data:
{
toggle:
'buttons'
}
}
.btn-group
{
data:
{
toggle:
'buttons'
}
}
...
...
app/views/projects/jobs/_sidebar.html.haml
View file @
f2cb08e1
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
%span
=
time_ago_with_tooltip
@build
.
artifacts_expire_at
%span
=
time_ago_with_tooltip
@build
.
artifacts_expire_at
-
if
@build
.
artifacts?
-
if
@build
.
artifacts?
.btn-group.
btn-group.
d-flex
{
role: :group
}
.btn-group.d-flex
{
role: :group
}
-
if
@build
.
has_expiring_artifacts?
&&
can?
(
current_user
,
:update_build
,
@build
)
-
if
@build
.
has_expiring_artifacts?
&&
can?
(
current_user
,
:update_build
,
@build
)
=
link_to
keep_project_job_artifacts_path
(
@project
,
@build
),
class:
'btn btn-sm btn-default'
,
method: :post
do
=
link_to
keep_project_job_artifacts_path
(
@project
,
@build
),
class:
'btn btn-sm btn-default'
,
method: :post
do
Keep
Keep
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
-
if
@build
.
trigger_variables
.
any?
-
if
@build
.
trigger_variables
.
any?
%p
%p
%button
.btn.group.
btn-group.
js-reveal-variables
Reveal Variables
%button
.btn.group.js-reveal-variables
Reveal Variables
%dl
.js-build-variables.trigger-build-variables.hide
%dl
.js-build-variables.trigger-build-variables.hide
-
@build
.
trigger_variables
.
each
do
|
trigger_variable
|
-
@build
.
trigger_variables
.
each
do
|
trigger_variable
|
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
f2cb08e1
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
=
link_to
_
(
'Edit'
),
'#'
,
class:
'js-sidebar-dropdown-toggle edit-link float-right'
=
link_to
_
(
'Edit'
),
'#'
,
class:
'js-sidebar-dropdown-toggle edit-link float-right'
.value.hide-collapsed
.value.hide-collapsed
-
if
issuable
.
milestone
-
if
issuable
.
milestone
=
link_to
issuable
.
milestone
.
title
,
milestone_path
(
issuable
.
milestone
),
class:
"bold has-tooltip"
,
title:
milestone_tooltip_due_date
(
issuable
.
milestone
),
data:
{
container:
"body"
,
html:
'true'
}
=
link_to
issuable
.
milestone
.
title
,
milestone_path
(
issuable
.
milestone
),
class:
"bold has-tooltip"
,
title:
milestone_tooltip_due_date
(
issuable
.
milestone
),
data:
{
container:
"body"
,
html:
'true'
,
boundary:
'viewport'
}
-
else
-
else
%span
.no-value
%span
.no-value
=
_
(
'None'
)
=
_
(
'None'
)
...
...
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