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
e95326d1
Commit
e95326d1
authored
Jul 09, 2020
by
allison.browne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change format of namespacing
Change format of namespacing to be consistent with other files
parent
3e567872
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
61 additions
and
57 deletions
+61
-57
app/helpers/ci/runners_helper.rb
app/helpers/ci/runners_helper.rb
+30
-28
ee/app/helpers/ee/ci/runners_helper.rb
ee/app/helpers/ee/ci/runners_helper.rb
+28
-26
ee/app/views/layouts/header/_buy_pipeline_minutes.html.haml
ee/app/views/layouts/header/_buy_pipeline_minutes.html.haml
+1
-1
ee/spec/views/layouts/header/_current_user_dropdown.html.haml_spec.rb
...s/layouts/header/_current_user_dropdown.html.haml_spec.rb
+2
-2
No files found.
app/helpers/ci/runners_helper.rb
View file @
e95326d1
# frozen_string_literal: true
module
Ci::RunnersHelper
module
Ci
module
RunnersHelper
def
runner_status_icon
(
runner
)
status
=
runner
.
status
case
status
...
...
@@ -38,6 +39,7 @@ module Ci::RunnersHelper
runner
.
contacted_at
end
end
end
end
Ci
::
RunnersHelper
.
prepend_if_ee
(
'EE::Ci::RunnersHelper'
)
ee/app/helpers/ee/ci/runners_helper.rb
View file @
e95326d1
# frozen_string_literal: true
module
EE
module
Ci::RunnersHelper
module
Ci
module
RunnersHelper
include
::
Gitlab
::
Utils
::
StrongMemoize
BUY_PIPELINE_MINUTES_NOTIFICATION_DOT
=
'buy_pipeline_minutes_notification_dot'
...
...
@@ -41,4 +42,5 @@ module EE
end
end
end
end
end
ee/app/views/layouts/header/_buy_pipeline_minutes.html.haml
View file @
e95326d1
...
...
@@ -16,7 +16,7 @@
-
if
show_pipeline_minutes_notification_dot?
(
project
,
namespace
)
-
link_class
<<
' js-follow-link'
%li
.js-buy-pipeline-minutes-notification-callout
{
data:
{
feature_id:
Ci
::
RunnersHelper
::
BUY_PIPELINE_MINUTES_NOTIFICATION_DOT
,
%li
.js-buy-pipeline-minutes-notification-callout
{
data:
{
feature_id:
::
Ci
::
RunnersHelper
::
BUY_PIPELINE_MINUTES_NOTIFICATION_DOT
,
dismiss_endpoint:
user_callouts_path
}
}
=
link_to
path
,
class:
link_class
,
data:
data_attributes
do
=
yield
:buy_pipeline_with_subtext
...
...
ee/spec/views/layouts/header/_current_user_dropdown.html.haml_spec.rb
View file @
e95326d1
...
...
@@ -39,7 +39,7 @@ RSpec.describe 'layouts/header/_current_user_dropdown' do
expect
(
subject
).
to
have_link
(
'Buy Pipeline minutes'
)
expect
(
subject
).
to
have_content
(
'One of your groups is running out'
)
expect
(
subject
).
to
have_selector
(
'.js-follow-link'
)
expect
(
subject
).
to
have_selector
(
"[data-feature-id='
#{
Ci
::
RunnersHelper
::
BUY_PIPELINE_MINUTES_NOTIFICATION_DOT
}
']"
)
expect
(
subject
).
to
have_selector
(
"[data-feature-id='
#{
::
Ci
::
RunnersHelper
::
BUY_PIPELINE_MINUTES_NOTIFICATION_DOT
}
']"
)
expect
(
subject
).
to
have_selector
(
"[data-dismiss-endpoint='
#{
user_callouts_path
}
']"
)
end
end
...
...
@@ -51,7 +51,7 @@ RSpec.describe 'layouts/header/_current_user_dropdown' do
expect
(
subject
).
to
have_link
(
'Buy Pipeline minutes'
)
expect
(
subject
).
to
have_content
(
'One of your groups is running out'
)
expect
(
subject
).
not_to
have_selector
(
'.js-follow-link'
)
expect
(
subject
).
not_to
have_selector
(
"[data-feature-id='
#{
Ci
::
RunnersHelper
::
BUY_PIPELINE_MINUTES_NOTIFICATION_DOT
}
']"
)
expect
(
subject
).
not_to
have_selector
(
"[data-feature-id='
#{
::
Ci
::
RunnersHelper
::
BUY_PIPELINE_MINUTES_NOTIFICATION_DOT
}
']"
)
expect
(
subject
).
not_to
have_selector
(
"[data-dismiss-endpoint='
#{
user_callouts_path
}
']"
)
end
end
...
...
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