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
Kazuhiko Shiozaki
gitlab-ce
Commits
fa7ee3ad
Commit
fa7ee3ad
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
ba39ca9f
3ab7933c
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
52 additions
and
90 deletions
+52
-90
CHANGELOG
CHANGELOG
+2
-0
app/assets/javascripts/application.js.coffee
app/assets/javascripts/application.js.coffee
+1
-3
app/assets/stylesheets/generic/selects.scss
app/assets/stylesheets/generic/selects.scss
+3
-45
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+0
-1
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+18
-17
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+4
-0
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+1
-1
app/views/groups/group_members/_group_member.html.haml
app/views/groups/group_members/_group_member.html.haml
+4
-2
app/views/projects/diffs/_diffs.html.haml
app/views/projects/diffs/_diffs.html.haml
+1
-1
app/views/projects/diffs/_file.html.haml
app/views/projects/diffs/_file.html.haml
+2
-3
app/views/projects/diffs/_stats.html.haml
app/views/projects/diffs/_stats.html.haml
+2
-5
app/views/projects/issues/index.html.haml
app/views/projects/issues/index.html.haml
+1
-1
app/views/projects/project_members/_project_member.html.haml
app/views/projects/project_members/_project_member.html.haml
+5
-3
app/views/projects/protected_branches/index.html.haml
app/views/projects/protected_branches/index.html.haml
+5
-5
app/views/shared/_group_form.html.haml
app/views/shared/_group_form.html.haml
+1
-1
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+2
-2
No files found.
CHANGELOG
View file @
fa7ee3ad
...
@@ -6,6 +6,8 @@ v 7.10.0 (unreleased)
...
@@ -6,6 +6,8 @@ v 7.10.0 (unreleased)
- Add a service to support external wikis (Hannes Rosenögger)
- Add a service to support external wikis (Hannes Rosenögger)
- List new commits for newly pushed branch in activity view.
- List new commits for newly pushed branch in activity view.
- Add changelog, license and contribution guide links to project sidebar.
- Add changelog, license and contribution guide links to project sidebar.
- Improve diff UI
- Identical look of selectboxes in UI
v 7.9.0 (unreleased)
v 7.9.0 (unreleased)
- Add HipChat integration documentation (Stan Hu)
- Add HipChat integration documentation (Stan Hu)
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/application.js.coffee
View file @
fa7ee3ad
...
@@ -169,9 +169,7 @@ $ ->
...
@@ -169,9 +169,7 @@ $ ->
# Show/hide comments on diff
# Show/hide comments on diff
$
(
"body"
).
on
"click"
,
".js-toggle-diff-comments"
,
(
e
)
->
$
(
"body"
).
on
"click"
,
".js-toggle-diff-comments"
,
(
e
)
->
$
(
@
).
find
(
'i'
).
$
(
@
).
toggleClass
(
'active'
)
toggleClass
(
'fa fa-chevron-down'
).
toggleClass
(
'fa fa-chevron-up'
)
$
(
@
).
closest
(
".diff-file"
).
find
(
".notes_holder"
).
toggle
()
$
(
@
).
closest
(
".diff-file"
).
find
(
".notes_holder"
).
toggle
()
e
.
preventDefault
()
e
.
preventDefault
()
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/generic/selects.scss
View file @
fa7ee3ad
...
@@ -46,55 +46,13 @@
...
@@ -46,55 +46,13 @@
}
}
}
}
select
{
.select2-container
{
&
.select2
{
width
:
100%
!
important
;
width
:
100px
;
}
&
.select2-sm
{
width
:
100px
;
}
}
@media
(
min-width
:
$screen-sm-min
)
{
select
{
&
.select2
{
width
:
150px
;
}
&
.select2-sm
{
width
:
120px
;
}
}
}
}
/* Medium devices (desktops, 992px and up) */
@media
(
min-width
:
$screen-md-min
)
{
select
{
&
.select2
{
width
:
170px
;
}
&
.select2-sm
{
width
:
140px
;
}
}
}
/* Large devices (large desktops, 1200px and up) */
@media
(
min-width
:
$screen-lg-min
)
{
select
{
&
.select2
{
width
:
200px
;
}
&
.select2-sm
{
width
:
150px
;
}
}
}
/** Branch/tag selector **/
/** Branch/tag selector **/
.project-refs-form
.select2-container
{
.project-refs-form
.select2-container
{
margin-right
:
10px
;
width
:
160px
!
important
;
}
}
.ajax-users-dropdown
,
.ajax-project-users-dropdown
{
.ajax-users-dropdown
,
.ajax-project-users-dropdown
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/groups.scss
View file @
fa7ee3ad
.new-group-member-holder
{
.new-group-member-holder
{
margin-top
:
50px
;
margin-top
:
50px
;
background
:
#f9f9f9
;
padding-top
:
20px
;
padding-top
:
20px
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/issues.scss
View file @
fa7ee3ad
...
@@ -59,33 +59,34 @@
...
@@ -59,33 +59,34 @@
}
}
}
}
@media
(
min-width
:
800px
)
{
.issues_filters
select
{
width
:
160px
;
}
}
@media
(
min-width
:
800px
)
{
@media
(
min-width
:
1200px
)
{
.issues_filters
select
{
width
:
220px
;
}
}
.issues_bulk_update
{
select
,
.select2-container
{
width
:
120px
!
important
;
display
:
inline-block
;
}
}
}
@media
(
min-width
:
800px
)
{
.issues_bulk_update
.select2-container
{
min-width
:
120px
;
}
}
@media
(
min-width
:
1200px
)
{
@media
(
min-width
:
1200px
)
{
.issues_bulk_update
.select2-container
{
min-width
:
160px
;
}
}
.issues_bulk_update
{
select
,
.select2-container
{
width
:
160px
!
important
;
display
:
inline-block
;
}
}
}
.issues_bulk_update
{
.issues_bulk_update
{
.select2-container
.select2-choice
{
.select2-container
.select2-choice
{
color
:
#444
!
important
;
color
:
#444
!
important
;
font-weight
:
500
;
}
}
}
}
#update_status
{
width
:
100px
;
}
.participants
{
.participants
{
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
.issues_bulk_update
{
.select2-container
{
text-shadow
:
none
;
}
}
.issue-search-form
{
.issue-search-form
{
margin
:
0
;
margin
:
0
;
height
:
24px
;
height
:
24px
;
...
@@ -177,6 +178,6 @@ h2.issue-title {
...
@@ -177,6 +178,6 @@ h2.issue-title {
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.
context
.select2-container
{
.
issue-form
.select2-container
{
width
:
100%
!
important
;
width
:
250px
!
important
;
}
}
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/merge_requests.scss
View file @
fa7ee3ad
...
@@ -194,3 +194,7 @@
...
@@ -194,3 +194,7 @@
}
}
}
}
}
}
.merge-request-form
.select2-container
{
width
:
250px
!
important
;
}
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/tree.scss
View file @
fa7ee3ad
...
@@ -112,7 +112,7 @@
...
@@ -112,7 +112,7 @@
.tree-ref-holder
{
.tree-ref-holder
{
float
:
left
;
float
:
left
;
margin-right
:
6
px
;
margin-right
:
15
px
;
.select2-container
.select2-choice
,
.select2-container.select2-drop-above
.select2-choice
{
.select2-container
.select2-choice
,
.select2-container.select2-drop-above
.select2-choice
{
padding
:
4px
12px
;
padding
:
4px
12px
;
...
...
This diff is collapsed.
Click to expand it.
app/views/groups/group_members/_group_member.html.haml
View file @
fa7ee3ad
...
@@ -31,7 +31,9 @@
...
@@ -31,7 +31,9 @@
%i
.fa.fa-minus.fa-inverse
%i
.fa.fa-minus.fa-inverse
.edit-member.hide.js-toggle-content
.edit-member.hide.js-toggle-content
%br
=
form_for
[
@group
,
member
],
remote:
true
do
|
f
|
=
form_for
[
@group
,
member
],
remote:
true
do
|
f
|
.alert.prepend-top-20
.prepend-top-10
=
f
.
select
:access_level
,
options_for_select
(
GroupMember
.
access_level_roles
,
member
.
access_level
)
=
f
.
select
:access_level
,
options_for_select
(
GroupMember
.
access_level_roles
,
member
.
access_level
),
{},
class:
'form-control'
.prepend-top-10
=
f
.
submit
'Save'
,
class:
'btn btn-save btn-sm'
=
f
.
submit
'Save'
,
class:
'btn btn-save btn-sm'
This diff is collapsed.
Click to expand it.
app/views/projects/diffs/_diffs.html.haml
View file @
fa7ee3ad
.row
.row
.prepend-top-20.append-bottom-10
.col-md-8
.col-md-8
=
render
'projects/diffs/stats'
,
diffs:
diffs
=
render
'projects/diffs/stats'
,
diffs:
diffs
.col-md-4
.col-md-4
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/diffs/_file.html.haml
View file @
fa7ee3ad
...
@@ -22,9 +22,8 @@
...
@@ -22,9 +22,8 @@
.diff-btn-group
.diff-btn-group
-
if
blob
.
text?
-
if
blob
.
text?
=
link_to
'#'
,
class:
'js-toggle-diff-comments btn btn-sm'
do
=
link_to
'#'
,
class:
'js-toggle-diff-comments btn btn-sm active has_tooltip'
,
title:
"Toggle comments for this file"
do
%i
.fa.fa-chevron-down
%i
.fa.fa-comments
Show/Hide comments
-
if
@merge_request
&&
@merge_request
.
source_project
-
if
@merge_request
&&
@merge_request
.
source_project
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/diffs/_stats.html.haml
View file @
fa7ee3ad
.js-toggle-container
.js-toggle-container
.commit-stat-summary
.commit-stat-summary
Showing
Showing
%strong
.cdark
#{
pluralize
(
diffs
.
count
,
"changed file"
)
}
=
link_to
'#'
,
class:
'js-toggle-button'
do
%strong
#{
pluralize
(
diffs
.
count
,
"changed file"
)
}
-
if
current_controller?
(
:commit
)
-
if
current_controller?
(
:commit
)
-
unless
@commit
.
has_zero_stats?
-
unless
@commit
.
has_zero_stats?
with
with
%strong
.cgreen
#{
@commit
.
stats
.
additions
}
additions
%strong
.cgreen
#{
@commit
.
stats
.
additions
}
additions
and
and
%strong
.cred
#{
@commit
.
stats
.
deletions
}
deletions
%strong
.cred
#{
@commit
.
stats
.
deletions
}
deletions
=
link_to
'#'
,
class:
'btn btn-sm js-toggle-button'
do
Show diff stats
%i
.fa.fa-chevron-down
.file-stats.js-toggle-content.hide
.file-stats.js-toggle-content.hide
%ul
.bordered-list
%ul
.bordered-list
-
diffs
.
each_with_index
do
|
diff
,
i
|
-
diffs
.
each_with_index
do
|
diff
,
i
|
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/issues/index.html.haml
View file @
fa7ee3ad
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
.clearfix
.clearfix
.issues_bulk_update.hide
.issues_bulk_update.hide
=
form_tag
bulk_update_namespace_project_issues_path
(
@project
.
namespace
,
@project
),
method: :post
do
=
form_tag
bulk_update_namespace_project_issues_path
(
@project
.
namespace
,
@project
),
method: :post
do
=
select_tag
(
'update[state_event]'
,
options_for_select
([[
'Open'
,
'reopen'
],
[
'Closed'
,
'close'
]]),
prompt:
"Status"
)
=
select_tag
(
'update[state_event]'
,
options_for_select
([[
'Open'
,
'reopen'
],
[
'Closed'
,
'close'
]]),
prompt:
"Status"
,
class:
'form-control'
)
=
project_users_select_tag
(
'update[assignee_id]'
,
placeholder:
'Assignee'
)
=
project_users_select_tag
(
'update[assignee_id]'
,
placeholder:
'Assignee'
)
=
select_tag
(
'update[milestone_id]'
,
bulk_update_milestone_options
,
prompt:
"Milestone"
)
=
select_tag
(
'update[milestone_id]'
,
bulk_update_milestone_options
,
prompt:
"Milestone"
)
=
hidden_field_tag
'update[issues_ids]'
,
[]
=
hidden_field_tag
'update[issues_ids]'
,
[]
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/project_members/_project_member.html.haml
View file @
fa7ee3ad
...
@@ -29,7 +29,9 @@
...
@@ -29,7 +29,9 @@
%i
.fa.fa-minus.fa-inverse
%i
.fa.fa-minus.fa-inverse
.edit-member.hide.js-toggle-content
.edit-member.hide.js-toggle-content
%br
=
form_for
member
,
as: :project_member
,
url:
namespace_project_project_member_path
(
@project
.
namespace
,
@project
,
member
.
user
),
remote:
true
do
|
f
|
=
form_for
member
,
as: :project_member
,
url:
namespace_project_project_member_path
(
@project
.
namespace
,
@project
,
member
.
user
),
remote:
true
do
|
f
|
.alert.prepend-top-20
.prepend-top-10
=
f
.
select
:access_level
,
options_for_select
(
ProjectMember
.
access_roles
,
member
.
access_level
)
=
f
.
select
:access_level
,
options_for_select
(
ProjectMember
.
access_roles
,
member
.
access_level
),
{},
class:
'form-control'
=
f
.
submit
'Save'
,
class:
'btn btn-save btn-sm'
.prepend-top-10
=
f
.
submit
'Save'
,
class:
'btn btn-save'
This diff is collapsed.
Click to expand it.
app/views/projects/protected_branches/index.html.haml
View file @
fa7ee3ad
...
@@ -23,12 +23,12 @@
...
@@ -23,12 +23,12 @@
.col-sm-10
.col-sm-10
=
f
.
select
(
:name
,
@project
.
open_branches
.
map
{
|
br
|
[
br
.
name
,
br
.
name
]
}
,
{
include_blank:
"Select branch"
},
{
class:
"select2"
})
=
f
.
select
(
:name
,
@project
.
open_branches
.
map
{
|
br
|
[
br
.
name
,
br
.
name
]
}
,
{
include_blank:
"Select branch"
},
{
class:
"select2"
})
.form-group
.form-group
=
f
.
label
:developers_can_push
,
class:
'control-label'
do
.col-sm-offset-2.col-sm-10
Developers can push
.col-sm-10
.checkbox
.checkbox
=
f
.
label
:developers_can_push
do
=
f
.
check_box
:developers_can_push
=
f
.
check_box
:developers_can_push
%span
.descr
Allow developers to push to this branch
%strong
Developers can push
.help-block
Allow developers to push to this branch
.form-actions
.form-actions
=
f
.
submit
'Protect'
,
class:
"btn-create btn"
=
f
.
submit
'Protect'
,
class:
"btn-create btn"
=
render
'branches_list'
=
render
'branches_list'
...
...
This diff is collapsed.
Click to expand it.
app/views/shared/_group_form.html.haml
View file @
fa7ee3ad
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
=
f
.
text_field
:path
,
placeholder:
'open-source'
,
class:
'form-control'
,
=
f
.
text_field
:path
,
placeholder:
'open-source'
,
class:
'form-control'
,
autofocus:
local_assigns
[
:autofocus
]
||
false
autofocus:
local_assigns
[
:autofocus
]
||
false
-
if
@group
.
persisted?
-
if
@group
.
persisted?
.alert.alert-
danger
.alert.alert-
warning.prepend-top-10
%ul
%ul
%li
Changing group path can have unintended side effects.
%li
Changing group path can have unintended side effects.
%li
Renaming group path will rename directory for all related projects
%li
Renaming group path will rename directory for all related projects
...
...
This diff is collapsed.
Click to expand it.
features/steps/project/merge_requests.rb
View file @
fa7ee3ad
...
@@ -209,13 +209,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -209,13 +209,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I click link "Hide inline discussion" of the second file'
do
step
'I click link "Hide inline discussion" of the second file'
do
within
'.files [id^=diff]:nth-child(2)'
do
within
'.files [id^=diff]:nth-child(2)'
do
click_link
'Show/Hide comments'
find
(
'.js-toggle-diff-comments'
).
click
end
end
end
end
step
'I click link "Show inline discussion" of the second file'
do
step
'I click link "Show inline discussion" of the second file'
do
within
'.files [id^=diff]:nth-child(2)'
do
within
'.files [id^=diff]:nth-child(2)'
do
click_link
'Show/Hide comments'
find
(
'.js-toggle-diff-comments'
).
click
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
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