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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
8c1d4146
Commit
8c1d4146
authored
Jan 01, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include tw bootstrap manually. Fix hide class
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
a379bd00
Changes
37
Show whitespace changes
Inline
Side-by-side
Showing
37 changed files
with
127 additions
and
50 deletions
+127
-50
app/assets/javascripts/behaviors/toggler_behavior.coffee
app/assets/javascripts/behaviors/toggler_behavior.coffee
+1
-1
app/assets/stylesheets/application.scss
app/assets/stylesheets/application.scss
+2
-2
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+0
-4
app/assets/stylesheets/gl_bootstrap.scss
app/assets/stylesheets/gl_bootstrap.scss
+80
-0
app/assets/stylesheets/sections/events.scss
app/assets/stylesheets/sections/events.scss
+1
-0
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+1
-1
app/views/admin/broadcast_messages/index.html.haml
app/views/admin/broadcast_messages/index.html.haml
+2
-2
app/views/dashboard/_activities.html.haml
app/views/dashboard/_activities.html.haml
+1
-1
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-1
app/views/help/_shortcuts.html.haml
app/views/help/_shortcuts.html.haml
+1
-1
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+1
-1
app/views/layouts/_public_head_panel.html.haml
app/views/layouts/_public_head_panel.html.haml
+1
-1
app/views/layouts/_search.html.haml
app/views/layouts/_search.html.haml
+1
-1
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+1
-1
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+1
-1
app/views/projects/blob/_remove.html.haml
app/views/projects/blob/_remove.html.haml
+1
-1
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+1
-1
app/views/projects/commits/_image.html.haml
app/views/projects/commits/_image.html.haml
+5
-5
app/views/projects/create.js.haml
app/views/projects/create.js.haml
+1
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+2
-2
app/views/projects/graphs/show.html.haml
app/views/projects/graphs/show.html.haml
+2
-2
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/_issues.html.haml
+1
-1
app/views/projects/issues/update.js.haml
app/views/projects/issues/update.js.haml
+1
-1
app/views/projects/merge_requests/show/_commits.html.haml
app/views/projects/merge_requests/show/_commits.html.haml
+1
-1
app/views/projects/merge_requests/show/_how_to_merge.html.haml
...iews/projects/merge_requests/show/_how_to_merge.html.haml
+2
-2
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+1
-1
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+2
-2
app/views/projects/notes/_discussion.html.haml
app/views/projects/notes/_discussion.html.haml
+2
-2
app/views/projects/notes/_form.html.haml
app/views/projects/notes/_form.html.haml
+1
-1
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+2
-2
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+1
-1
app/views/projects/tree/_blob_item.html.haml
app/views/projects/tree/_blob_item.html.haml
+1
-1
app/views/projects/tree/_tree_item.html.haml
app/views/projects/tree/_tree_item.html.haml
+1
-1
app/views/projects/update.js.haml
app/views/projects/update.js.haml
+1
-1
app/views/projects/walls/show.html.haml
app/views/projects/walls/show.html.haml
+1
-1
app/views/projects/wikis/_new.html.haml
app/views/projects/wikis/_new.html.haml
+1
-1
app/views/users_groups/_users_group.html.haml
app/views/users_groups/_users_group.html.haml
+1
-1
No files found.
app/assets/javascripts/behaviors/toggler_behavior.coffee
View file @
8c1d4146
...
@@ -9,7 +9,7 @@ $ ->
...
@@ -9,7 +9,7 @@ $ ->
toggleClass
(
'icon-chevron-down'
).
toggleClass
(
'icon-chevron-down'
).
toggleClass
(
'icon-chevron-up'
)
toggleClass
(
'icon-chevron-up'
)
container
=
$
(
".js-toggle-visibility-container"
)
container
=
$
(
".js-toggle-visibility-container"
)
container
.
toggleClass
(
"
gl-
hide"
)
container
.
toggleClass
(
"hide"
)
e
.
preventDefault
()
e
.
preventDefault
()
$
(
"body"
).
on
"click"
,
".js-toggle-button"
,
(
e
)
->
$
(
"body"
).
on
"click"
,
".js-toggle-button"
,
(
e
)
->
...
...
app/assets/stylesheets/application.scss
View file @
8c1d4146
...
@@ -14,9 +14,9 @@
...
@@ -14,9 +14,9 @@
@import
"main/fonts.scss"
;
@import
"main/fonts.scss"
;
/**
/**
*
Twitter bootstrap:
*
Customized Twitter bootstrap
*/
*/
@import
'bootstrap'
;
@import
'
gl_
bootstrap'
;
/**
/**
* Font icons
* Font icons
...
...
app/assets/stylesheets/generic/common.scss
View file @
8c1d4146
...
@@ -127,10 +127,6 @@ pre.well-pre {
...
@@ -127,10 +127,6 @@ pre.well-pre {
background
:
#29b
;
background
:
#29b
;
}
}
.gl-hide
{
display
:
none
;
}
.breadcrumb
>
li
+
li
:before
{
.breadcrumb
>
li
+
li
:before
{
content
:
"/"
;
content
:
"/"
;
padding
:
0
;
padding
:
0
;
...
...
app/assets/stylesheets/gl_bootstrap.scss
0 → 100644
View file @
8c1d4146
// Core variables and mixins
@import
"bootstrap/variables"
;
@import
"bootstrap/mixins"
;
// Reset
@import
"bootstrap/normalize"
;
@import
"bootstrap/print"
;
// Core CSS
@import
"bootstrap/scaffolding"
;
@import
"bootstrap/type"
;
@import
"bootstrap/code"
;
@import
"bootstrap/grid"
;
@import
"bootstrap/tables"
;
@import
"bootstrap/forms"
;
@import
"bootstrap/buttons"
;
// Components
@import
"bootstrap/component-animations"
;
@import
"bootstrap/glyphicons"
;
@import
"bootstrap/dropdowns"
;
@import
"bootstrap/button-groups"
;
@import
"bootstrap/input-groups"
;
@import
"bootstrap/navs"
;
@import
"bootstrap/navbar"
;
@import
"bootstrap/breadcrumbs"
;
@import
"bootstrap/pagination"
;
@import
"bootstrap/pager"
;
@import
"bootstrap/labels"
;
@import
"bootstrap/badges"
;
@import
"bootstrap/jumbotron"
;
@import
"bootstrap/thumbnails"
;
@import
"bootstrap/alerts"
;
@import
"bootstrap/progress-bars"
;
@import
"bootstrap/media"
;
@import
"bootstrap/list-group"
;
@import
"bootstrap/panels"
;
@import
"bootstrap/wells"
;
@import
"bootstrap/close"
;
// Components w/ JavaScript
@import
"bootstrap/modals"
;
@import
"bootstrap/tooltip"
;
@import
"bootstrap/popovers"
;
@import
"bootstrap/carousel"
;
// Utility classes
.clearfix
{
@include
clearfix
();
}
.center-block
{
@include
center-block
();
}
.pull-right
{
float
:
right
!
important
;
}
.pull-left
{
float
:
left
!
important
;
}
.hide
{
display
:
none
;
}
.show
{
display
:
block
!
important
;
}
.invisible
{
visibility
:
hidden
;
}
.text-hide
{
@include
text-hide
();
}
.hidden
{
display
:
none
!
important
;
visibility
:
hidden
!
important
;
}
.affix
{
position
:
fixed
;
}
@import
"bootstrap/responsive-utilities"
;
app/assets/stylesheets/sections/events.scss
View file @
8c1d4146
...
@@ -75,6 +75,7 @@
...
@@ -75,6 +75,7 @@
margin-top
:
4px
;
margin-top
:
4px
;
margin-left
:
0px
;
margin-left
:
0px
;
max-width
:
200px
;
max-width
:
200px
;
float
:
none
;
}
}
p
:last-child
{
p
:last-child
{
...
...
app/assets/stylesheets/sections/notes.scss
View file @
8c1d4146
...
@@ -80,7 +80,6 @@ ul.notes {
...
@@ -80,7 +80,6 @@ ul.notes {
overflow
:
hidden
;
overflow
:
hidden
;
display
:
block
;
display
:
block
;
position
:relative
;
position
:relative
;
font-family
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
p
{
color
:
$style_color
;
}
p
{
color
:
$style_color
;
}
.avatar
{
.avatar
{
...
@@ -122,6 +121,7 @@ ul.notes {
...
@@ -122,6 +121,7 @@ ul.notes {
.file
.notes_holder
{
.file
.notes_holder
{
font-size
:
13px
;
font-size
:
13px
;
line-height
:
18px
;
line-height
:
18px
;
font-family
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
td
{
td
{
border
:
1px
solid
#ddd
;
border
:
1px
solid
#ddd
;
...
...
app/views/admin/broadcast_messages/index.html.haml
View file @
8c1d4146
...
@@ -18,12 +18,12 @@
...
@@ -18,12 +18,12 @@
%div
%div
=
link_to
'#'
,
class:
'js-toggle-colors-link'
do
=
link_to
'#'
,
class:
'js-toggle-colors-link'
do
Customize colors
Customize colors
.form-group.js-toggle-colors-container.
gl-
hide
.form-group.js-toggle-colors-container.hide
=
f
.
label
:color
,
"Background Color"
=
f
.
label
:color
,
"Background Color"
.col-sm-10
.col-sm-10
=
f
.
text_field
:color
,
placeholder:
"#AA33EE"
=
f
.
text_field
:color
,
placeholder:
"#AA33EE"
.light
Hex values as 3 double digit numbers, starting with a # sign.
.light
Hex values as 3 double digit numbers, starting with a # sign.
.form-group.js-toggle-colors-container.
gl-
hide
.form-group.js-toggle-colors-container.hide
=
f
.
label
:font
,
"Font Color"
=
f
.
label
:font
,
"Font Color"
.col-sm-10
.col-sm-10
=
f
.
text_field
:font
,
placeholder:
"#224466"
=
f
.
text_field
:font
,
placeholder:
"#224466"
...
...
app/views/dashboard/_activities.html.haml
View file @
8c1d4146
...
@@ -5,4 +5,4 @@
...
@@ -5,4 +5,4 @@
.content_list
.content_list
-
else
-
else
%p
.nothing_here_message
Projects activity will be displayed here
%p
.nothing_here_message
Projects activity will be displayed here
.loading.
gl-
hide
.loading.hide
app/views/groups/show.html.haml
View file @
8c1d4146
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
.content_list
.content_list
-
else
-
else
%p
.nothing_here_message
Project activity will be displayed here
%p
.nothing_here_message
Project activity will be displayed here
.loading.
gl-
hide
.loading.hide
.side.col-md-4
.side.col-md-4
-
if
@group
.
description
.
present?
-
if
@group
.
description
.
present?
.description-block
.description-block
...
...
app/views/help/_shortcuts.html.haml
View file @
8c1d4146
#modal-shortcuts
.modal.
gl-
hide
#modal-shortcuts
.modal.hide
.modal-header
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
Keyboard Shortcuts
%h3
Keyboard Shortcuts
...
...
app/views/layouts/_head_panel.html.haml
View file @
8c1d4146
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
%ul
.nav.navbar-nav
%ul
.nav.navbar-nav
%li
%li
%a
%a
%div
.
gl-
hide.turbolink-spinner
%div
.hide.turbolink-spinner
%i
.icon-refresh.icon-spin
%i
.icon-refresh.icon-spin
Loading...
Loading...
%li
.hidden-sm
%li
.hidden-sm
...
...
app/views/layouts/_public_head_panel.html.haml
View file @
8c1d4146
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
%ul
.nav
%ul
.nav
%li
%li
%a
%a
%div
.
gl-
hide.turbolink-spinner
%div
.hide.turbolink-spinner
%i
.icon-refresh.icon-spin
%i
.icon-refresh.icon-spin
Loading...
Loading...
%li
%li
...
...
app/views/layouts/_search.html.haml
View file @
8c1d4146
...
@@ -7,4 +7,4 @@
...
@@ -7,4 +7,4 @@
=
hidden_field_tag
:search_code
,
true
=
hidden_field_tag
:search_code
,
true
=
hidden_field_tag
:repository_ref
,
@ref
=
hidden_field_tag
:repository_ref
,
@ref
=
submit_tag
'Go'
if
ENV
[
'RAILS_ENV'
]
==
'test'
=
submit_tag
'Go'
if
ENV
[
'RAILS_ENV'
]
==
'test'
.search-autocomplete-json.
gl-
hide
{
:'data-autocomplete-opts'
=>
search_autocomplete_source
}
.search-autocomplete-json.hide
{
:'data-autocomplete-opts'
=>
search_autocomplete_source
}
app/views/profiles/accounts/show.html.haml
View file @
8c1d4146
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
%div
%div
=
f
.
text_field
:username
,
required:
true
,
class:
'form-control'
=
f
.
text_field
:username
,
required:
true
,
class:
'form-control'
%span
.loading-gif.
gl-
hide
=
image_tag
"ajax_loader.gif"
%span
.loading-gif.hide
=
image_tag
"ajax_loader.gif"
%p
.light
%p
.light
=
user_url
(
@user
)
=
user_url
(
@user
)
%div
%div
...
...
app/views/profiles/notifications/show.html.haml
View file @
8c1d4146
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
%span
.btn.btn-tiny
%span
.btn.btn-tiny
%i
.icon-chevron-down
%i
.icon-chevron-down
%span
Advanced notifications settings
%span
Advanced notifications settings
.js-toggle-visibility-container.
gl-
hide
.js-toggle-visibility-container.hide
%hr
%hr
%h4
Groups:
%h4
Groups:
%ul
.bordered-list
%ul
.bordered-list
...
...
app/views/projects/blob/_remove.html.haml
View file @
8c1d4146
%div
#modal-remove-blob
.modal.
gl-
hide
%div
#modal-remove-blob
.modal.hide
.modal-header
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
.page-title
Remove
#{
@blob
.
name
}
%h3
.page-title
Remove
#{
@blob
.
name
}
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
8c1d4146
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
-
if
@branches
.
any?
-
if
@branches
.
any?
and in
and in
=
link_to
(
"
#{
pluralize
(
@branches
.
count
,
"other branch"
)
}
"
,
"#"
,
class:
"js-details-expand"
)
=
link_to
(
"
#{
pluralize
(
@branches
.
count
,
"other branch"
)
}
"
,
"#"
,
class:
"js-details-expand"
)
%span
.js-details-contain.
gl-
hide
%span
.js-details-contain.hide
=
commit_branches_links
(
@project
,
@branches
)
=
commit_branches_links
(
@project
,
@branches
)
.commit-box
.commit-box
...
...
app/views/projects/commits/_image.html.haml
View file @
8c1d4146
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
.frame.deleted
.frame.deleted
%a
{
href:
project_blob_path
(
@project
,
tree_join
(
@commit
.
parent_id
,
diff
.
old_path
))}
%a
{
href:
project_blob_path
(
@project
,
tree_join
(
@commit
.
parent_id
,
diff
.
old_path
))}
%img
{
src:
"data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"
}
%img
{
src:
"data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"
}
%p
.image-info.
gl-
hide
%p
.image-info.hide
%span
.meta-filesize
=
"
#{
number_to_human_size
old_file
.
size
}
"
%span
.meta-filesize
=
"
#{
number_to_human_size
old_file
.
size
}
"
|
|
%b
W:
%b
W:
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
.frame.added
.frame.added
%a
{
href:
project_blob_path
(
@project
,
tree_join
(
@commit
.
id
,
diff
.
new_path
))}
%a
{
href:
project_blob_path
(
@project
,
tree_join
(
@commit
.
id
,
diff
.
new_path
))}
%img
{
src:
"data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"
}
%img
{
src:
"data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"
}
%p
.image-info.
gl-
hide
%p
.image-info.hide
%span
.meta-filesize
=
"
#{
number_to_human_size
file
.
size
}
"
%span
.meta-filesize
=
"
#{
number_to_human_size
file
.
size
}
"
|
|
%b
W:
%b
W:
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
%b
H:
%b
H:
%span
.meta-height
%span
.meta-height
%div
.swipe.view.
gl-
hide
%div
.swipe.view.hide
.swipe-frame
.swipe-frame
.frame.deleted
.frame.deleted
%img
{
src:
"data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"
}
%img
{
src:
"data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"
}
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
%span
.top-handle
%span
.top-handle
%span
.bottom-handle
%span
.bottom-handle
%div
.onion-skin.view.
gl-
hide
%div
.onion-skin.view.hide
.onion-skin-frame
.onion-skin-frame
.frame.deleted
.frame.deleted
%img
{
src:
"data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"
}
%img
{
src:
"data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"
}
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
.opaque
.opaque
.view-modes.
gl-
hide
.view-modes.hide
%ul
.view-modes-menu
%ul
.view-modes-menu
%li
.two-up
{
data:
{
mode:
'two-up'
}}
2-up
%li
.two-up
{
data:
{
mode:
'two-up'
}}
2-up
%li
.swipe
{
data:
{
mode:
'swipe'
}}
Swipe
%li
.swipe
{
data:
{
mode:
'swipe'
}}
Swipe
...
...
app/views/projects/create.js.haml
View file @
8c1d4146
...
@@ -5,5 +5,5 @@
...
@@ -5,5 +5,5 @@
:plain
:plain
$(".project-edit-errors").html("
#{
escape_javascript
(
render
(
'errors'
))
}
");
$(".project-edit-errors").html("
#{
escape_javascript
(
render
(
'errors'
))
}
");
$('.project-submit').enable();
$('.project-submit').enable();
$('.save-project-loader').
gl-
hide();
$('.save-project-loader').hide();
$('.project-edit-container').show();
$('.project-edit-container').show();
app/views/projects/edit.html.haml
View file @
8c1d4146
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
Show it to me
Show it to me
%i
.icon-chevron-down
%i
.icon-chevron-down
.js-toggle-visibility-container.
gl-
hide
.js-toggle-visibility-container.hide
-
if
can?
current_user
,
:archive_project
,
@project
-
if
can?
current_user
,
:archive_project
,
@project
.ui-box.ui-box-danger
.ui-box.ui-box-danger
.title
.title
...
@@ -182,7 +182,7 @@
...
@@ -182,7 +182,7 @@
-
else
-
else
%p
.nothing_here_message
Only project owner can remove a project
%p
.nothing_here_message
Only project owner can remove a project
.save-project-loader.
gl-
hide
.save-project-loader.hide
%center
%center
=
image_tag
"ajax_loader.gif"
=
image_tag
"ajax_loader.gif"
%h3
Saving project.
%h3
Saving project.
...
...
app/views/projects/graphs/show.html.haml
View file @
8c1d4146
...
@@ -21,14 +21,14 @@
...
@@ -21,14 +21,14 @@
%ol
.contributors-list.clearfix
%ol
.contributors-list.clearfix
:javascript
:javascript
$
(
"
.stat-graph
"
).
gl
-
hide
();
$
(
"
.stat-graph
"
).
hide
();
$
.
ajax
({
$
.
ajax
({
type
:
"
GET
"
,
type
:
"
GET
"
,
url
:
location
.
href
,
url
:
location
.
href
,
complete
:
function
()
{
complete
:
function
()
{
$
(
"
.stat-graph
"
).
fadeIn
();
$
(
"
.stat-graph
"
).
fadeIn
();
$
(
"
.loading-graph
"
).
gl
-
hide
();
$
(
"
.loading-graph
"
).
hide
();
},
},
dataType
:
"
script
"
dataType
:
"
script
"
});
});
app/views/projects/issues/_issues.html.haml
View file @
8c1d4146
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.title
.title
=
check_box_tag
"check_all_issues"
,
nil
,
false
,
class:
"check_all_issues left"
=
check_box_tag
"check_all_issues"
,
nil
,
false
,
class:
"check_all_issues left"
.clearfix
.clearfix
.issues_bulk_update.
gl-
hide
.issues_bulk_update.hide
=
form_tag
bulk_update_project_issues_path
(
@project
),
method: :post
do
=
form_tag
bulk_update_project_issues_path
(
@project
),
method: :post
do
%span
Update selected issues with
%span
Update selected issues with
=
select_tag
(
'update[status]'
,
options_for_select
([
'open'
,
'closed'
]),
prompt:
"Status"
)
=
select_tag
(
'update[status]'
,
options_for_select
([
'open'
,
'closed'
]),
prompt:
"Status"
)
...
...
app/views/projects/issues/update.js.haml
View file @
8c1d4146
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
$('.issue-box .context').html("
#{
escape_javascript
(
render
partial:
'issue_context'
,
locals:
{
issue:
@issue
})
}
");
$('.issue-box .context').html("
#{
escape_javascript
(
render
partial:
'issue_context'
,
locals:
{
issue:
@issue
})
}
");
$('.issue-box .context').effect('highlight');
$('.issue-box .context').effect('highlight');
$('.chosen').chosen();
$('.chosen').chosen();
$('.edit-issue.inline-update input[type="submit"]').
gl-
hide();
$('.edit-issue.inline-update input[type="submit"]').hide();
-
if
@issue
.
milestone
-
if
@issue
.
milestone
$('.milestone-nav-link').replaceWith("
#{
escape_javascript
(
link_to
"| #{@issue.milestone.title}"
,
project_milestone_path
(
@issue
.
project
,
@issue
.
milestone
),
:class
=>
'milestone-nav-link'
)
}
")
$('.milestone-nav-link').replaceWith("
#{
escape_javascript
(
link_to
"| #{@issue.milestone.title}"
,
project_milestone_path
(
@issue
.
project
,
@issue
.
milestone
),
:class
=>
'milestone-nav-link'
)
}
")
-
else
-
else
...
...
app/views/projects/merge_requests/show/_commits.html.haml
View file @
8c1d4146
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
8 of
#{
@commits
.
count
}
commits displayed.
8 of
#{
@commits
.
count
}
commits displayed.
%strong
%strong
%a
.show-all-commits
Click here to show all
%a
.show-all-commits
Click here to show all
%ul
.all-commits.
gl-
hide.well-list
%ul
.all-commits.hide.well-list
-
@commits
.
each
do
|
commit
|
-
@commits
.
each
do
|
commit
|
=
render
"projects/commits/commit"
,
commit:
commit
,
project:
@merge_request
.
source_project
=
render
"projects/commits/commit"
,
commit:
commit
,
project:
@merge_request
.
source_project
...
...
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
8c1d4146
%div
#modal_merge_info
.modal.
gl-
hide
%div
#modal_merge_info
.modal.hide
.modal-header
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
How to merge
%h3
How to merge
...
@@ -46,6 +46,6 @@
...
@@ -46,6 +46,6 @@
modal
.
show
();
modal
.
show
();
});
});
$
(
'
.modal-header .close
'
).
bind
(
"
click
"
,
function
(){
$
(
'
.modal-header .close
'
).
bind
(
"
click
"
,
function
(){
modal
.
gl
-
hide
();
modal
.
hide
();
})
})
})
})
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
8c1d4146
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
.alert.alert-info
.alert.alert-info
%strong
This merge request already can not be merged. Try to reload page.
%strong
This merge request already can not be merged. Try to reload page.
.merge-in-progress.
gl-
hide
.merge-in-progress.hide
%span
.cgray
%span
.cgray
%i
.icon-refresh.icon-spin
%i
.icon-refresh.icon-spin
...
...
app/views/projects/new.html.haml
View file @
8c1d4146
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
=
link_to
"#"
,
class:
'js-toggle-visibility-link'
do
=
link_to
"#"
,
class:
'js-toggle-visibility-link'
do
%span
Customize repository name?
%span
Customize repository name?
.form-group.js-toggle-visibility-container.
gl-
hide
.form-group.js-toggle-visibility-container.hide
=
f
.
label
:path
,
class:
'control-label'
do
=
f
.
label
:path
,
class:
'control-label'
do
%span
Repository name
%span
Repository name
.col-sm-10
.col-sm-10
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
=
link_to
new_group_path
,
class:
"btn btn-tiny"
do
=
link_to
new_group_path
,
class:
"btn btn-tiny"
do
Create a group
Create a group
.save-project-loader.
gl-
hide
.save-project-loader.hide
%center
%center
=
image_tag
"ajax_loader.gif"
=
image_tag
"ajax_loader.gif"
%h3
Creating project
&
repository.
%h3
Creating project
&
repository.
...
...
app/views/projects/notes/_discussion.html.haml
View file @
8c1d4146
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
.file
=
render
"projects/notes/discussion_diff"
,
discussion_notes:
discussion_notes
,
note:
note
.file
=
render
"projects/notes/discussion_diff"
,
discussion_notes:
discussion_notes
,
note:
note
-
else
-
else
=
link_to
'show outdated discussion'
,
'#'
,
class:
'js-show-outdated-discussion'
=
link_to
'show outdated discussion'
,
'#'
,
class:
'js-show-outdated-discussion'
%div
.
gl-
hide.outdated-discussion
%div
.hide.outdated-discussion
.content
.content
.notes
{
rel:
discussion_notes
.
first
.
discussion_id
}
.notes
{
rel:
discussion_notes
.
first
.
discussion_id
}
=
render
discussion_notes
=
render
discussion_notes
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
=
render
"projects/notes/discussion_reply_button"
,
note:
discussion_notes
.
first
=
render
"projects/notes/discussion_reply_button"
,
note:
discussion_notes
.
first
-# will be shown when the other one is hidden
-# will be shown when the other one is hidden
.discussion-hidden.content.
gl-
hide
.discussion-hidden.content.hide
.note
.note
%em
Hidden discussion.
%em
Hidden discussion.
=
link_to
"javascript:;"
,
class:
"js-details-target js-toggler-target"
do
=
link_to
"javascript:;"
,
class:
"js-details-target js-toggler-target"
do
...
...
app/views/projects/notes/_form.html.haml
View file @
8c1d4146
...
@@ -33,6 +33,6 @@
...
@@ -33,6 +33,6 @@
%span
Choose File ...
%span
Choose File ...
%span
.file_name.js-attachment-filename
File name...
%span
.file_name.js-attachment-filename
File name...
=
f
.
file_field
:attachment
,
class:
"js-note-attachment-input hid
e
"
=
f
.
file_field
:attachment
,
class:
"js-note-attachment-input hid
den
"
.clearfix
.clearfix
app/views/projects/notes/_note.html.haml
View file @
8c1d4146
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
=
form_for
note
,
url:
project_note_path
(
@project
,
note
),
method: :put
,
remote:
true
,
authenticity_token:
true
do
|
f
|
=
form_for
note
,
url:
project_note_path
(
@project
,
note
),
method: :put
,
remote:
true
,
authenticity_token:
true
do
|
f
|
=
f
.
text_area
:note
,
class:
'note_text js-note-text js-gfm-input turn-on'
=
f
.
text_area
:note
,
class:
'note_text js-note-text js-gfm-input turn-on'
.form-actions
.form-actions
.clearfix
=
f
.
submit
'Save changes'
,
class:
"btn btn-primary btn-save"
=
f
.
submit
'Save changes'
,
class:
"btn btn-primary btn-save"
.note-form-option
.note-form-option
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
%span
Choose File ...
%span
Choose File ...
%span
.file_name.js-attachment-filename
File name...
%span
.file_name.js-attachment-filename
File name...
=
f
.
file_field
:attachment
,
class:
"js-note-attachment-input hid
e
"
=
f
.
file_field
:attachment
,
class:
"js-note-attachment-input hid
den
"
=
link_to
'Cancel'
,
"#"
,
class:
"btn btn-cancel note-edit-cancel"
=
link_to
'Cancel'
,
"#"
,
class:
"btn btn-cancel note-edit-cancel"
...
...
app/views/projects/show.html.haml
View file @
8c1d4146
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
=
render
"events/event_last_push"
,
event:
@last_push
=
render
"events/event_last_push"
,
event:
@last_push
=
render
'shared/event_filter'
=
render
'shared/event_filter'
.content_list
.content_list
.loading.
gl-
hide
.loading.hide
.col-md-3.project-side
.col-md-3.project-side
.clearfix
.clearfix
-
if
@project
.
archived?
-
if
@project
.
archived?
...
...
app/views/projects/tree/_blob_item.html.haml
View file @
8c1d4146
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
=
tree_icon
(
type
)
=
tree_icon
(
type
)
%span
=
link_to
truncate
(
blob_item
.
name
,
length:
40
),
project_blob_path
(
@project
,
tree_join
(
@id
||
@commit
.
id
,
blob_item
.
name
))
%span
=
link_to
truncate
(
blob_item
.
name
,
length:
40
),
project_blob_path
(
@project
,
tree_join
(
@id
||
@commit
.
id
,
blob_item
.
name
))
%td
.tree_time_ago.cgray
%td
.tree_time_ago.cgray
%span
.log_loading.
gl-
hide
%span
.log_loading.hide
Loading commit data...
Loading commit data...
=
image_tag
"ajax_loader_tree.gif"
,
width:
14
=
image_tag
"ajax_loader_tree.gif"
,
width:
14
%td
.tree_commit
{
colspan:
2
}
%td
.tree_commit
{
colspan:
2
}
app/views/projects/tree/_tree_item.html.haml
View file @
8c1d4146
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
=
tree_icon
(
type
)
=
tree_icon
(
type
)
%span
=
link_to
truncate
(
tree_item
.
name
,
length:
40
),
project_tree_path
(
@project
,
tree_join
(
@id
||
@commit
.
id
,
tree_item
.
name
))
%span
=
link_to
truncate
(
tree_item
.
name
,
length:
40
),
project_tree_path
(
@project
,
tree_join
(
@id
||
@commit
.
id
,
tree_item
.
name
))
%td
.tree_time_ago.cgray
%td
.tree_time_ago.cgray
%span
.log_loading.
gl-
hide
%span
.log_loading.hide
Loading commit data...
Loading commit data...
=
image_tag
"ajax_loader_tree.gif"
,
width:
14
=
image_tag
"ajax_loader_tree.gif"
,
width:
14
%td
.tree_commit
{
colspan:
2
}
%td
.tree_commit
{
colspan:
2
}
app/views/projects/update.js.haml
View file @
8c1d4146
...
@@ -4,6 +4,6 @@
...
@@ -4,6 +4,6 @@
-
else
-
else
:plain
:plain
$(".project-edit-errors").html("
#{
escape_javascript
(
render
(
'errors'
))
}
");
$(".project-edit-errors").html("
#{
escape_javascript
(
render
(
'errors'
))
}
");
$('.save-project-loader').
gl-
hide();
$('.save-project-loader').hide();
$('.project-edit-container').show();
$('.project-edit-container').show();
$('.project-edit-content .btn-save').enableButton();
$('.project-edit-content .btn-save').enableButton();
app/views/projects/walls/show.html.haml
View file @
8c1d4146
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
%span
Choose File ...
%span
Choose File ...
%span
.file_name.js-attachment-filename
File name...
%span
.file_name.js-attachment-filename
File name...
=
f
.
file_field
:attachment
,
class:
"js-note-attachment-input hid
e
"
=
f
.
file_field
:attachment
,
class:
"js-note-attachment-input hid
den
"
.hint.pull-right
CTRL + Enter to send message
.hint.pull-right
CTRL + Enter to send message
.clearfix
.clearfix
app/views/projects/wikis/_new.html.haml
View file @
8c1d4146
%div
#modal-new-wiki
.modal.
gl-
hide
%div
#modal-new-wiki
.modal.hide
.modal-header
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
.page-title
New Wiki Page
%h3
.page-title
New Wiki Page
...
...
app/views/users_groups/_users_group.html.haml
View file @
8c1d4146
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
=
link_to
group_users_group_path
(
@group
,
member
),
data:
{
confirm:
remove_user_from_group_message
(
@group
,
user
)
},
method: :delete
,
remote:
true
,
class:
"btn-tiny btn btn-remove"
,
title:
'Remove user from group'
do
=
link_to
group_users_group_path
(
@group
,
member
),
data:
{
confirm:
remove_user_from_group_message
(
@group
,
user
)
},
method: :delete
,
remote:
true
,
class:
"btn-tiny btn btn-remove"
,
title:
'Remove user from group'
do
%i
.icon-minus.icon-white
%i
.icon-minus.icon-white
.edit-member.
gl-
hide.js-toggle-content
.edit-member.hide.js-toggle-content
=
form_for
[
@group
,
member
],
remote:
true
do
|
f
|
=
form_for
[
@group
,
member
],
remote:
true
do
|
f
|
.alert.prepend-top-20
.alert.prepend-top-20
=
f
.
select
:group_access
,
options_for_select
(
UsersGroup
.
group_access_roles
,
member
.
group_access
)
=
f
.
select
:group_access
,
options_for_select
(
UsersGroup
.
group_access_roles
,
member
.
group_access
)
...
...
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