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
6184197f
Commit
6184197f
authored
Jul 03, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more action button movements
fixed eslint failures fixed project select dropdown not working on some pages
parent
08a0af9f
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
49 additions
and
14 deletions
+49
-14
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+4
-0
app/views/dashboard/_snippets_head.html.haml
app/views/dashboard/_snippets_head.html.haml
+6
-3
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+7
-1
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+5
-1
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+9
-2
app/views/groups/labels/index.html.haml
app/views/groups/labels/index.html.haml
+7
-3
app/views/groups/merge_requests.html.haml
app/views/groups/merge_requests.html.haml
+5
-1
app/views/groups/milestones/index.html.haml
app/views/groups/milestones/index.html.haml
+6
-3
No files found.
app/assets/javascripts/dispatcher.js
View file @
6184197f
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-arrow-callback, wrap-iife, no-shadow, consistent-return, one-var, one-var-declaration-per-line, camelcase, default-case, no-new, quotes, no-duplicate-case, no-case-declarations, no-fallthrough, max-len */
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-arrow-callback, wrap-iife, no-shadow, consistent-return, one-var, one-var-declaration-per-line, camelcase, default-case, no-new, quotes, no-duplicate-case, no-case-declarations, no-fallthrough, max-len */
/* global ProjectSelect */
/* global UsernameValidator */
/* global UsernameValidator */
/* global ActiveTabMemoizer */
/* global ActiveTabMemoizer */
/* global ShortcutsNavigation */
/* global ShortcutsNavigation */
...
@@ -151,6 +152,8 @@ import initExperimentalFlags from './experimental_flags';
...
@@ -151,6 +152,8 @@ import initExperimentalFlags from './experimental_flags';
new
ZenMode
();
new
ZenMode
();
break
;
break
;
case
'
dashboard:milestones:index
'
:
case
'
dashboard:milestones:index
'
:
case
'
dashboard:issues
'
:
case
'
dashboard:merge_requests
'
:
new
ProjectSelect
();
new
ProjectSelect
();
break
;
break
;
case
'
projects:milestones:show
'
:
case
'
projects:milestones:show
'
:
...
@@ -162,6 +165,7 @@ import initExperimentalFlags from './experimental_flags';
...
@@ -162,6 +165,7 @@ import initExperimentalFlags from './experimental_flags';
case
'
groups:issues
'
:
case
'
groups:issues
'
:
case
'
groups:merge_requests
'
:
case
'
groups:merge_requests
'
:
new
UsersSelect
();
new
UsersSelect
();
new
ProjectSelect
();
break
;
break
;
case
'
dashboard:todos:index
'
:
case
'
dashboard:todos:index
'
:
new
gl
.
Todos
();
new
gl
.
Todos
();
...
...
app/views/dashboard/_snippets_head.html.haml
View file @
6184197f
-
if
show_new_nav?
&&
current_user
-
content_for
:breadcrumbs_extra
do
=
link_to
"New snippet"
,
new_snippet_path
,
class:
"btn btn-new"
,
title:
"New snippet"
.top-area
.top-area
%ul
.nav-links
%ul
.nav-links
=
nav_link
(
page:
dashboard_snippets_path
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
page:
dashboard_snippets_path
,
html_options:
{
class:
'home'
})
do
...
@@ -8,6 +12,5 @@
...
@@ -8,6 +12,5 @@
Explore Snippets
Explore Snippets
-
if
current_user
-
if
current_user
.nav-controls.hidden-xs
.nav-controls.hidden-xs
{
class:
(
"hidden-sm hidden-md hidden-lg"
if
show_new_nav?
)
}
=
link_to
new_snippet_path
,
class:
"btn btn-new"
,
title:
"New snippet"
do
=
link_to
"New snippet"
,
new_snippet_path
,
class:
"btn btn-new"
,
title:
"New snippet"
New snippet
app/views/dashboard/issues.html.haml
View file @
6184197f
...
@@ -3,9 +3,15 @@
...
@@ -3,9 +3,15 @@
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
params
.
merge
(
rss_url_options
),
title:
"
#{
current_user
.
name
}
issues"
)
=
auto_discovery_link_tag
(
:atom
,
params
.
merge
(
rss_url_options
),
title:
"
#{
current_user
.
name
}
issues"
)
-
if
show_new_nav?
-
content_for
:breadcrumbs_extra
do
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn has-tooltip append-right-10'
,
title:
'Subscribe'
do
=
icon
(
'rss'
)
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
with_feature_enabled:
'issues'
.top-area
.top-area
=
render
'shared/issuable/nav'
,
type: :issues
=
render
'shared/issuable/nav'
,
type: :issues
.nav-controls
.nav-controls
{
class:
(
"visible-xs"
if
show_new_nav?
)
}
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn has-tooltip'
,
title:
'Subscribe'
do
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn has-tooltip'
,
title:
'Subscribe'
do
=
icon
(
'rss'
)
=
icon
(
'rss'
)
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
with_feature_enabled:
'issues'
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
with_feature_enabled:
'issues'
...
...
app/views/dashboard/merge_requests.html.haml
View file @
6184197f
-
page_title
"Merge Requests"
-
page_title
"Merge Requests"
-
header_title
"Merge Requests"
,
merge_requests_dashboard_path
(
assignee_id:
current_user
.
id
)
-
header_title
"Merge Requests"
,
merge_requests_dashboard_path
(
assignee_id:
current_user
.
id
)
-
if
show_new_nav?
-
content_for
:breadcrumbs_extra
do
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
with_feature_enabled:
'merge_requests'
.top-area
.top-area
=
render
'shared/issuable/nav'
,
type: :merge_requests
=
render
'shared/issuable/nav'
,
type: :merge_requests
.nav-controls
.nav-controls
{
class:
(
"visible-xs"
if
show_new_nav?
)
}
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
with_feature_enabled:
'merge_requests'
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
with_feature_enabled:
'merge_requests'
=
render
'shared/issuable/filter'
,
type: :merge_requests
=
render
'shared/issuable/filter'
,
type: :merge_requests
...
...
app/views/groups/issues.html.haml
View file @
6184197f
-
page_title
"Issues"
-
page_title
"Issues"
-
group_issues_exists
=
group_issues
(
@group
).
exists?
=
render
"head_issues"
=
render
"head_issues"
=
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"
)
-
if
group_issues
(
@group
).
exists?
-
if
show_new_nav?
&&
group_issues_exists
-
content_for
:breadcrumbs_extra
do
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn btn-default append-right-10'
do
=
icon
(
'rss'
)
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
-
if
group_issues_exists
.top-area
.top-area
=
render
'shared/issuable/nav'
,
type: :issues
=
render
'shared/issuable/nav'
,
type: :issues
.nav-controls
.nav-controls
{
class:
(
"visible-xs"
if
show_new_nav?
)
}
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn'
do
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn'
do
=
icon
(
'rss'
)
=
icon
(
'rss'
)
%span
.icon-label
%span
.icon-label
...
...
app/views/groups/labels/index.html.haml
View file @
6184197f
-
page_title
'Labels'
-
page_title
'Labels'
-
if
show_new_nav?
&&
can?
(
current_user
,
:admin_label
,
@group
)
-
content_for
:breadcrumbs_extra
do
=
link_to
"New label"
,
new_group_label_path
(
@group
),
class:
"btn btn-new"
=
render
"groups/head_issues"
=
render
"groups/head_issues"
.top-area.adjust
.top-area.adjust
.nav-text
.nav-text
Labels can be applied to issues and merge requests. Group labels are available for any project within the group.
Labels can be applied to issues and merge requests. Group labels are available for any project within the group.
.nav-controls
.nav-controls
{
class:
(
"visible-xs"
if
show_new_nav?
)
}
-
if
can?
(
current_user
,
:admin_label
,
@group
)
-
if
can?
(
current_user
,
:admin_label
,
@group
)
=
link_to
new_group_label_path
(
@group
),
class:
"btn btn-new"
do
=
link_to
"New label"
,
new_group_label_path
(
@group
),
class:
"btn btn-new"
New label
.labels
.labels
.other-labels
.other-labels
...
...
app/views/groups/merge_requests.html.haml
View file @
6184197f
-
page_title
"Merge Requests"
-
page_title
"Merge Requests"
-
if
show_new_nav?
&&
current_user
-
content_for
:breadcrumbs_extra
do
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
-
if
@group_merge_requests
.
empty?
-
if
@group_merge_requests
.
empty?
=
render
'shared/empty_states/merge_requests'
,
project_select_button:
true
=
render
'shared/empty_states/merge_requests'
,
project_select_button:
true
-
else
-
else
.top-area
.top-area
=
render
'shared/issuable/nav'
,
type: :merge_requests
=
render
'shared/issuable/nav'
,
type: :merge_requests
-
if
current_user
-
if
current_user
.nav-controls
.nav-controls
{
class:
(
"visible-xs"
if
show_new_nav?
)
}
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
=
render
'shared/issuable/filter'
,
type: :merge_requests
=
render
'shared/issuable/filter'
,
type: :merge_requests
...
...
app/views/groups/milestones/index.html.haml
View file @
6184197f
-
page_title
"Milestones"
-
page_title
"Milestones"
-
if
show_new_nav?
&&
can?
(
current_user
,
:admin_milestones
,
@group
)
-
content_for
:breadcrumbs_extra
do
=
link_to
"New milestone"
,
new_group_milestone_path
(
@group
),
class:
"btn btn-new"
=
render
"groups/head_issues"
=
render
"groups/head_issues"
.top-area
.top-area
=
render
'shared/milestones_filter'
,
counts:
@milestone_states
=
render
'shared/milestones_filter'
,
counts:
@milestone_states
.nav-controls
.nav-controls
{
class:
(
"visible-xs"
if
show_new_nav?
)
}
-
if
can?
(
current_user
,
:admin_milestones
,
@group
)
-
if
can?
(
current_user
,
:admin_milestones
,
@group
)
=
link_to
new_group_milestone_path
(
@group
),
class:
"btn btn-new"
do
=
link_to
"New milestone"
,
new_group_milestone_path
(
@group
),
class:
"btn btn-new"
New milestone
.row-content-block
.row-content-block
Only milestones from
Only milestones from
...
...
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