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
04393efc
Commit
04393efc
authored
Nov 03, 2021
by
Coung Ngo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Delete unused roadmap code
parent
68f22b98
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
57 deletions
+1
-57
ee/app/assets/javascripts/roadmap/roadmap_bundle.js
ee/app/assets/javascripts/roadmap/roadmap_bundle.js
+1
-12
ee/app/assets/stylesheets/page_bundles/roadmap.scss
ee/app/assets/stylesheets/page_bundles/roadmap.scss
+0
-8
ee/app/helpers/epics_helper.rb
ee/app/helpers/epics_helper.rb
+0
-12
ee/spec/helpers/epics_helper_spec.rb
ee/spec/helpers/epics_helper_spec.rb
+0
-22
locale/gitlab.pot
locale/gitlab.pot
+0
-3
No files found.
ee/app/assets/javascripts/roadmap/roadmap_bundle.js
View file @
04393efc
...
@@ -4,7 +4,7 @@ import { mapActions } from 'vuex';
...
@@ -4,7 +4,7 @@ import { mapActions } from 'vuex';
import
{
parseBoolean
,
convertObjectPropsToCamelCase
}
from
'
~/lib/utils/common_utils
'
;
import
{
parseBoolean
,
convertObjectPropsToCamelCase
}
from
'
~/lib/utils/common_utils
'
;
import
createDefaultClient
from
'
~/lib/graphql
'
;
import
createDefaultClient
from
'
~/lib/graphql
'
;
import
{
visitUrl
,
mergeUrlParams
,
queryToObject
}
from
'
~/lib/utils/url_utility
'
;
import
{
queryToObject
}
from
'
~/lib/utils/url_utility
'
;
import
Translate
from
'
~/vue_shared/translate
'
;
import
Translate
from
'
~/vue_shared/translate
'
;
import
EpicItem
from
'
./components/epic_item.vue
'
;
import
EpicItem
from
'
./components/epic_item.vue
'
;
...
@@ -23,7 +23,6 @@ Vue.use(Translate);
...
@@ -23,7 +23,6 @@ Vue.use(Translate);
export
default
()
=>
{
export
default
()
=>
{
const
el
=
document
.
getElementById
(
'
js-roadmap
'
);
const
el
=
document
.
getElementById
(
'
js-roadmap
'
);
const
presetButtonsContainer
=
document
.
querySelector
(
'
.js-btn-roadmap-presets
'
);
if
(
!
el
)
{
if
(
!
el
)
{
return
false
;
return
false
;
...
@@ -35,16 +34,6 @@ export default () => {
...
@@ -35,16 +34,6 @@ export default () => {
defaultClient
,
defaultClient
,
});
});
// This event handler is to be removed in 11.1 once
// we allow user to save selected preset in db
if
(
presetButtonsContainer
)
{
presetButtonsContainer
.
addEventListener
(
'
click
'
,
(
e
)
=>
{
const
presetType
=
e
.
target
.
querySelector
(
'
input[name="presetType"]
'
).
value
;
visitUrl
(
mergeUrlParams
({
layout
:
presetType
},
window
.
location
.
href
));
});
}
Vue
.
component
(
'
EpicItem
'
,
EpicItem
);
Vue
.
component
(
'
EpicItem
'
,
EpicItem
);
Vue
.
component
(
'
EpicItemContainer
'
,
EpicItemContainer
);
Vue
.
component
(
'
EpicItemContainer
'
,
EpicItemContainer
);
...
...
ee/app/assets/stylesheets/page_bundles/roadmap.scss
View file @
04393efc
...
@@ -97,14 +97,6 @@ html.group-epics-roadmap-html {
...
@@ -97,14 +97,6 @@ html.group-epics-roadmap-html {
}
}
}
}
.epics-roadmap-filters
{
.epics-details-filters
{
.btn-roadmap-preset
{
padding
:
7px
$gl-btn-padding
;
}
}
}
.group-epics-roadmap-wrapper
{
.group-epics-roadmap-wrapper
{
padding-bottom
:
0
;
padding-bottom
:
0
;
}
}
...
...
ee/app/helpers/epics_helper.rb
View file @
04393efc
...
@@ -31,18 +31,6 @@ module EpicsHelper
...
@@ -31,18 +31,6 @@ module EpicsHelper
opts
opts
end
end
def
epic_state_dropdown_link
(
state
,
selected_state
)
link_to
epic_state_title
(
state
),
page_filter_path
(
state:
state
),
class:
state
==
selected_state
?
'is-active'
:
''
end
def
epic_state_title
(
state
)
titles
=
{
"opened"
=>
"Open"
}
_
(
"%{state} epics"
)
%
{
state:
(
titles
[
state
.
to_s
]
||
state
.
to_s
.
humanize
)
}
end
def
epic_timeframe
(
epic
)
def
epic_timeframe
(
epic
)
short_format
=
'%b %d'
short_format
=
'%b %d'
long_format
=
'%b %d, %Y'
long_format
=
'%b %d, %Y'
...
...
ee/spec/helpers/epics_helper_spec.rb
View file @
04393efc
...
@@ -44,28 +44,6 @@ RSpec.describe EpicsHelper, type: :helper do
...
@@ -44,28 +44,6 @@ RSpec.describe EpicsHelper, type: :helper do
end
end
end
end
describe
'#epic_state_dropdown_link'
do
it
'returns the active link when selected state is same as the link'
do
expect
(
helper
.
epic_state_dropdown_link
(
:opened
,
:opened
))
.
to
eq
(
'<a class="is-active" href="?state=opened">Open epics</a>'
)
end
it
'returns the non-active link when selected state is different from the link'
do
expect
(
helper
.
epic_state_dropdown_link
(
:opened
,
:closed
))
.
to
eq
(
'<a class="" href="?state=opened">Open epics</a>'
)
end
end
describe
'#epic_state_title'
do
it
'returns "Open" when the state is opened'
do
expect
(
epic_state_title
(
:opened
)).
to
eq
(
'Open epics'
)
end
it
'returns humanized string when the state is other than opened'
do
expect
(
epic_state_title
(
:some_other_state
)).
to
eq
(
'Some other state epics'
)
end
end
describe
'#epic_timeframe'
do
describe
'#epic_timeframe'
do
let
(
:epic
)
{
build
(
:epic
,
start_date:
start_date
,
end_date:
end_date
)
}
let
(
:epic
)
{
build
(
:epic
,
start_date:
start_date
,
end_date:
end_date
)
}
...
...
locale/gitlab.pot
View file @
04393efc
...
@@ -896,9 +896,6 @@ msgstr ""
...
@@ -896,9 +896,6 @@ msgstr ""
msgid "%{start} to %{end}"
msgid "%{start} to %{end}"
msgstr ""
msgstr ""
msgid "%{state} epics"
msgstr ""
msgid "%{strongOpen}Warning:%{strongClose} SAML group links can cause GitLab to automatically remove members from groups."
msgid "%{strongOpen}Warning:%{strongClose} SAML group links can cause GitLab to automatically remove members from groups."
msgstr ""
msgstr ""
...
...
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