BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
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
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
49 additions
and
14 deletions
+49
-14
dispatcher.js
app/assets/javascripts/dispatcher.js
+4
-0
_snippets_head.html.haml
app/views/dashboard/_snippets_head.html.haml
+6
-3
issues.html.haml
app/views/dashboard/issues.html.haml
+7
-1
merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+5
-1
issues.html.haml
app/views/groups/issues.html.haml
+9
-2
index.html.haml
app/views/groups/labels/index.html.haml
+7
-3
merge_requests.html.haml
app/views/groups/merge_requests.html.haml
+5
-1
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 */
/* global ProjectSelect */
/* global UsernameValidator */
/* global ActiveTabMemoizer */
/* global ShortcutsNavigation */
...
...
@@ -151,6 +152,8 @@ import initExperimentalFlags from './experimental_flags';
new
ZenMode
();
break
;
case
'dashboard:milestones:index'
:
case
'dashboard:issues'
:
case
'dashboard:merge_requests'
:
new
ProjectSelect
();
break
;
case
'projects:milestones:show'
:
...
...
@@ -162,6 +165,7 @@ import initExperimentalFlags from './experimental_flags';
case
'groups:issues'
:
case
'groups:merge_requests'
:
new
UsersSelect
();
new
ProjectSelect
();
break
;
case
'dashboard:todos:index'
:
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
%ul
.nav-links
=
nav_link
(
page:
dashboard_snippets_path
,
html_options:
{
class:
'home'
})
do
...
...
@@ -8,6 +12,5 @@
Explore Snippets
-
if
current_user
.nav-controls.hidden-xs
=
link_to
new_snippet_path
,
class:
"btn btn-new"
,
title:
"New snippet"
do
New snippet
.nav-controls.hidden-xs
{
class:
(
"hidden-sm hidden-md hidden-lg"
if
show_new_nav?
)
}
=
link_to
"New snippet"
,
new_snippet_path
,
class:
"btn btn-new"
,
title:
"New snippet"
app/views/dashboard/issues.html.haml
View file @
6184197f
...
...
@@ -3,9 +3,15 @@
=
content_for
:meta_tags
do
=
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
=
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
=
icon
(
'rss'
)
=
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"
-
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
=
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/issuable/filter'
,
type: :merge_requests
...
...
app/views/groups/issues.html.haml
View file @
6184197f
-
page_title
"Issues"
-
group_issues_exists
=
group_issues
(
@group
).
exists?
=
render
"head_issues"
=
content_for
:meta_tags
do
=
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
=
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
=
icon
(
'rss'
)
%span
.icon-label
...
...
app/views/groups/labels/index.html.haml
View file @
6184197f
-
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"
.top-area.adjust
.nav-text
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
)
=
link_to
new_group_label_path
(
@group
),
class:
"btn btn-new"
do
New label
=
link_to
"New label"
,
new_group_label_path
(
@group
),
class:
"btn btn-new"
.labels
.other-labels
...
...
app/views/groups/merge_requests.html.haml
View file @
6184197f
-
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?
=
render
'shared/empty_states/merge_requests'
,
project_select_button:
true
-
else
.top-area
=
render
'shared/issuable/nav'
,
type: :merge_requests
-
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/issuable/filter'
,
type: :merge_requests
...
...
app/views/groups/milestones/index.html.haml
View file @
6184197f
-
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"
.top-area
=
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
)
=
link_to
new_group_milestone_path
(
@group
),
class:
"btn btn-new"
do
New milestone
=
link_to
"New milestone"
,
new_group_milestone_path
(
@group
),
class:
"btn btn-new"
.row-content-block
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