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
68e4df70
Commit
68e4df70
authored
Jun 14, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ui-ux-improvements' into 'master'
UI/UX improvements
parents
054d68a3
9be5425a
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
81 additions
and
101 deletions
+81
-101
files.scss
app/assets/stylesheets/generic/files.scss
+1
-1
snippets.scss
app/assets/stylesheets/sections/snippets.scss
+3
-0
tree.scss
app/assets/stylesheets/sections/tree.scss
+0
-9
ability.rb
app/models/ability.rb
+5
-1
_actions.html.haml
app/views/projects/blob/_actions.html.haml
+1
-1
_blob.html.haml
app/views/projects/snippets/_blob.html.haml
+0
-10
_form.html.haml
app/views/projects/snippets/_form.html.haml
+0
-42
edit.html.haml
app/views/projects/snippets/edit.html.haml
+4
-1
new.html.haml
app/views/projects/snippets/new.html.haml
+4
-1
show.html.haml
app/views/projects/snippets/show.html.haml
+28
-2
_blob.html.haml
app/views/shared/snippets/_blob.html.haml
+0
-0
_form.html.haml
app/views/shared/snippets/_form.html.haml
+7
-10
_blob.html.haml
app/views/snippets/_blob.html.haml
+0
-11
edit.html.haml
app/views/snippets/edit.html.haml
+4
-1
new.html.haml
app/views/snippets/new.html.haml
+4
-1
show.html.haml
app/views/snippets/show.html.haml
+15
-3
12_snippets.rb
db/fixtures/development/12_snippets.rb
+3
-3
snippets.feature
features/project/snippets.feature
+0
-1
snippets.feature
features/snippets/snippets.feature
+0
-1
snippets.rb
features/steps/project/snippets.rb
+1
-1
snippets.rb
features/steps/snippets/snippets.rb
+1
-1
No files found.
app/assets/stylesheets/generic/files.scss
View file @
68e4df70
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
.options
{
.options
{
float
:
right
;
float
:
right
;
margin-top
:
-
5
px
;
margin-top
:
-
3
px
;
}
}
.left-options
{
.left-options
{
...
...
app/assets/stylesheets/sections/snippets.scss
View file @
68e4df70
...
@@ -3,3 +3,6 @@
...
@@ -3,3 +3,6 @@
padding-top
:
0
;
padding-top
:
0
;
}
}
.snippet-form-holder
.file-holder
.file-title
{
padding
:
2px
;
}
app/assets/stylesheets/sections/tree.scss
View file @
68e4df70
...
@@ -117,15 +117,6 @@
...
@@ -117,15 +117,6 @@
}
}
}
}
.tree-btn-group
{
top
:
2px
;
.btn
{
margin-right
:
0px
;
padding
:
2px
10px
;
}
}
.tree-download-holder
.btn
{
.tree-download-holder
.btn
{
padding
:
4px
12px
;
padding
:
4px
12px
;
}
}
...
...
app/models/ability.rb
View file @
68e4df70
...
@@ -236,7 +236,11 @@ class Ability
...
@@ -236,7 +236,11 @@ class Ability
:"modify_
#{
name
}
"
,
:"modify_
#{
name
}
"
,
]
]
else
else
subject
.
respond_to?
(
:project
)
?
project_abilities
(
user
,
subject
.
project
)
:
[]
if
subject
.
respond_to?
(
:project
)
project_abilities
(
user
,
subject
.
project
)
else
[]
end
end
end
end
end
end
end
...
...
app/views/projects/blob/_actions.html.haml
View file @
68e4df70
...
@@ -14,6 +14,6 @@
...
@@ -14,6 +14,6 @@
=
link_to
"blame"
,
project_blame_path
(
@project
,
@id
),
class:
"btn btn-small"
unless
@blob
.
empty?
=
link_to
"blame"
,
project_blame_path
(
@project
,
@id
),
class:
"btn btn-small"
unless
@blob
.
empty?
=
link_to
"history"
,
project_commits_path
(
@project
,
@id
),
class:
"btn btn-small"
=
link_to
"history"
,
project_commits_path
(
@project
,
@id
),
class:
"btn btn-small"
-
if
allowed_tree_edit?
-
if
allowed_tree_edit?
=
link_to
'#modal-remove-blob'
,
class:
"remove-blob btn btn-small btn-remove"
,
"data-toggle"
=>
"modal"
do
=
link_to
'#modal-remove-blob'
,
class:
"remove-blob btn btn-small btn-remove"
,
"data-toggle"
=>
"modal"
do
remove
remove
app/views/projects/snippets/_blob.html.haml
deleted
100644 → 0
View file @
054d68a3
.file-holder
.file-title
%i
.icon-file
%strong
=
@snippet
.
file_name
%span
.options
.btn-group.tree-btn-group.pull-right
-
if
can?
(
current_user
,
:admin_project_snippet
,
@project
)
||
@snippet
.
author
==
current_user
=
link_to
"Edit"
,
edit_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-tiny"
,
title:
'Edit Snippet'
=
link_to
"Raw"
,
raw_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-tiny"
,
target:
"_blank"
=
render
'snippets/blob_content'
app/views/projects/snippets/_form.html.haml
deleted
100644 → 0
View file @
054d68a3
%h3
.page-title
=
@snippet
.
new_record?
?
"New Snippet"
:
"Edit Snippet #
#{
@snippet
.
id
}
"
%hr
.snippet-form-holder
=
form_for
[
@project
,
@snippet
],
as: :project_snippet
,
url:
url
,
html:
{
class:
"form-horizontal snippet-form"
}
do
|
f
|
-
if
@snippet
.
errors
.
any?
.alert.alert-danger
%ul
-
@snippet
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.form-group
=
f
.
label
:title
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'form-control'
,
required:
true
.form-group
.file-editor
=
f
.
label
:file_name
,
"File"
,
class:
'control-label'
.col-sm-10
.file-holder.snippet
.file-title
=
f
.
text_field
:file_name
,
placeholder:
"example.rb"
,
class:
'form-control snippet-file-name'
,
required:
true
.file-content.code
%pre
#editor
=
@snippet
.
content
=
f
.
hidden_field
:content
,
class:
'snippet-file-content'
.form-actions
-
if
@snippet
.
new_record?
=
f
.
submit
'Create snippet'
,
class:
"btn-create btn"
-
else
=
f
.
submit
'Save'
,
class:
"btn-save btn"
-
unless
@snippet
.
new_record?
.pull-right.prepend-left-20
=
link_to
'Remove snippet'
,
project_snippet_path
(
@project
,
@snippet
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn pull-right btn-remove delete-snippet prepend-left-10"
,
id:
"destroy_snippet_
#{
@snippet
.
id
}
"
=
link_to
"Cancel"
,
project_snippets_path
(
@project
),
class:
"btn btn-cancel"
:javascript
var
editor
=
ace
.
edit
(
"editor"
);
$
(
".snippet-form-holder form"
).
submit
(
function
(){
$
(
".snippet-file-content"
).
val
(
editor
.
getValue
());
});
app/views/projects/snippets/edit.html.haml
View file @
68e4df70
=
render
"projects/snippets/form"
,
url:
project_snippet_path
(
@project
,
@snippet
)
%h3
.page-title
Edit snippet
%hr
=
render
"shared/snippets/form"
,
url:
project_snippet_path
(
@project
,
@snippet
)
app/views/projects/snippets/new.html.haml
View file @
68e4df70
=
render
"projects/snippets/form"
,
url:
project_snippets_path
(
@project
,
@snippet
)
%h3
.page-title
New snippet
%hr
=
render
"shared/snippets/form"
,
url:
project_snippets_path
(
@project
,
@snippet
)
app/views/projects/snippets/show.html.haml
View file @
68e4df70
%h3
.page-title
%h3
.page-title
=
@snippet
.
title
=
@snippet
.
title
%small
.pull-right
.pull-right
=
link_to
new_project_snippet_path
(
@project
),
class:
"btn btn-new"
,
title:
"New Snippet"
do
Add new snippet
%hr
.append-bottom-20
.pull-right
=
"#
#{
@snippet
.
id
}
"
=
"#
#{
@snippet
.
id
}
"
%span
.light
%span
.light
by
by
=
link_to
user_path
(
@snippet
.
author
)
do
=
image_tag
avatar_icon
(
@snippet
.
author_email
),
class:
"avatar avatar-inline s16"
=
image_tag
avatar_icon
(
@snippet
.
author_email
),
class:
"avatar avatar-inline s16"
=
@snippet
.
author_name
=
@snippet
.
author_name
%div
=
render
'projects/snippets/blob'
.back-link
=
link_to
project_snippets_path
(
@project
)
do
←
project snippets
.file-holder
.file-title
%i
.icon-file
%span
.file_name
=
@snippet
.
file_name
.options
.btn-group
-
if
can?
(
current_user
,
:modify_project_snippet
,
@snippet
)
=
link_to
"edit"
,
edit_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-small"
,
title:
'Edit Snippet'
=
link_to
"raw"
,
raw_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-small"
,
target:
"_blank"
-
if
can?
(
current_user
,
:admin_project_snippet
,
@snippet
)
=
link_to
"remove"
,
project_snippet_path
(
@project
,
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-small btn-remove"
,
title:
'Delete Snippet'
=
render
'shared/snippets/blob'
%div
#notes
=
render
"projects/notes/notes_with_form"
%div
#notes
=
render
"projects/notes/notes_with_form"
app/views/s
nippets/_blob_content
.html.haml
→
app/views/s
hared/snippets/_blob
.html.haml
View file @
68e4df70
File moved
app/views/snippets/_form.html.haml
→
app/views/s
hared/s
nippets/_form.html.haml
View file @
68e4df70
%h3
.page-title
=
@snippet
.
new_record?
?
"New Snippet"
:
"Edit Snippet #
#{
@snippet
.
id
}
"
%hr
.snippet-form-holder
.snippet-form-holder
=
form_for
@snippet
,
as: :personal_snippet
,
url:
url
,
html:
{
class:
"form-horizontal snippet-form"
}
do
|
f
|
=
form_for
@snippet
,
url:
url
,
html:
{
class:
"form-horizontal snippet-form"
}
do
|
f
|
-
if
@snippet
.
errors
.
any?
-
if
@snippet
.
errors
.
any?
.alert.alert-danger
.alert.alert-danger
%ul
%ul
-
@snippet
.
errors
.
full_messages
.
each
do
|
msg
|
-
@snippet
.
errors
.
full_messages
.
each
do
|
msg
|
...
@@ -12,6 +9,8 @@
...
@@ -12,6 +9,8 @@
.form-group
.form-group
=
f
.
label
:title
,
class:
'control-label'
=
f
.
label
:title
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'form-control'
,
required:
true
.col-sm-10
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
,
class:
'form-control'
,
required:
true
-
unless
@snippet
.
respond_to?
(
:project
)
.form-group
.form-group
=
f
.
label
"Access"
,
class:
'control-label'
=
f
.
label
"Access"
,
class:
'control-label'
.col-sm-10
.col-sm-10
...
@@ -44,15 +43,13 @@
...
@@ -44,15 +43,13 @@
-
else
-
else
=
f
.
submit
'Save'
,
class:
"btn-save btn"
=
f
.
submit
'Save'
,
class:
"btn-save btn"
-
unless
@snippet
.
new_record?
-
if
@snippet
.
respond_to?
(
:project
)
.pull-right.prepend-left-20
=
link_to
"Cancel"
,
project_snippets_path
(
@project
),
class:
"btn btn-cancel"
=
link_to
'Remove'
,
snippet_path
(
@snippet
),
data:
{
confirm:
'Removed snippet cannot be restored! Are you sure?'
},
method: :delete
,
class:
"btn btn-remove delete-snippet"
,
id:
"destroy_snippet_
#{
@snippet
.
id
}
"
-
else
=
link_to
"Cancel"
,
snippets_path
(
@project
),
class:
"btn btn-cancel"
=
link_to
"Cancel"
,
snippets_path
(
@project
),
class:
"btn btn-cancel"
:javascript
:javascript
var
editor
=
ace
.
edit
(
"editor"
);
var
editor
=
ace
.
edit
(
"editor"
);
$
(
".snippet-form-holder form"
).
submit
(
function
(){
$
(
".snippet-form-holder form"
).
submit
(
function
(){
$
(
".snippet-file-content"
).
val
(
editor
.
getValue
());
$
(
".snippet-file-content"
).
val
(
editor
.
getValue
());
});
});
app/views/snippets/_blob.html.haml
deleted
100644 → 0
View file @
054d68a3
.file-holder
.file-title
%i
.icon-file
%strong
=
@snippet
.
file_name
%span
.options
.btn-group.tree-btn-group.pull-right
-
if
@snippet
.
author
==
current_user
=
link_to
"Edit"
,
edit_snippet_path
(
@snippet
),
class:
"btn btn-tiny"
,
title:
'Edit Snippet'
=
link_to
"Delete"
,
snippet_path
(
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-tiny"
,
title:
'Delete Snippet'
=
link_to
"Raw"
,
raw_snippet_path
(
@snippet
),
class:
"btn btn-tiny"
,
target:
"_blank"
=
render
'snippets/blob_content'
app/views/snippets/edit.html.haml
View file @
68e4df70
=
render
"snippets/form"
,
url:
snippet_path
(
@snippet
)
%h3
.page-title
Edit snippet
%hr
=
render
"shared/snippets/form"
,
url:
snippet_path
(
@snippet
)
app/views/snippets/new.html.haml
View file @
68e4df70
=
render
"snippets/form"
,
url:
snippets_path
(
@snippet
)
%h3
.page-title
New snippet
%hr
=
render
"shared/snippets/form"
,
url:
snippets_path
(
@snippet
)
app/views/snippets/show.html.haml
View file @
68e4df70
...
@@ -7,9 +7,9 @@
...
@@ -7,9 +7,9 @@
private
private
.pull-right
.pull-right
=
link_to
new_snippet_path
,
class:
"btn btn-new
btn-small
"
,
title:
"New Snippet"
do
=
link_to
new_snippet_path
,
class:
"btn btn-new"
,
title:
"New Snippet"
do
Add new snippet
Add new snippet
%hr
.append-bottom-20
.append-bottom-20
.pull-right
.pull-right
...
@@ -28,4 +28,16 @@
...
@@ -28,4 +28,16 @@
=
link_to
snippets_path
do
=
link_to
snippets_path
do
←
discover snippets
←
discover snippets
%div
=
render
'blob'
.file-holder
.file-title
%i
.icon-file
%span
.file_name
=
@snippet
.
file_name
.options
.btn-group
-
if
can?
(
current_user
,
:modify_personal_snippet
,
@snippet
)
=
link_to
"edit"
,
edit_snippet_path
(
@snippet
),
class:
"btn btn-small"
,
title:
'Edit Snippet'
=
link_to
"raw"
,
raw_snippet_path
(
@snippet
),
class:
"btn btn-small"
,
target:
"_blank"
-
if
can?
(
current_user
,
:admin_personal_snippet
,
@snippet
)
=
link_to
"remove"
,
snippet_path
(
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-small btn-remove"
,
title:
'Delete Snippet'
=
render
'shared/snippets/blob'
db/fixtures/development/12_snippets.rb
View file @
68e4df70
Gitlab
::
Seeder
.
quiet
do
Gitlab
::
Seeder
.
quiet
do
contents
=
[
contents
=
[
`curl https://gist.github.com/randx/4275756/raw/da2f262920c96d1a970d48bf2e99147954b1f4bd/glus1204.sh`
,
`curl https://gist.github
usercontent
.com/randx/4275756/raw/da2f262920c96d1a970d48bf2e99147954b1f4bd/glus1204.sh`
,
`curl https://gist.github
.com/randx/3754594/raw/11026a295e6ef3a151c635707a3e1e8e15fc4725/gitlab_setup.sh
`
,
`curl https://gist.github
usercontent.com/randx/3754594/raw/11026a295e6ef3a151c635707a3e1e8e15fc4725/gitlab_setup.sh
`
,
`curl https://gist.github.com/randx/3065552/raw/29fbd09f4605a5ea22a5a9095e35fd1938dea4d6/gistfile1.sh`
,
`curl https://gist.github
usercontent
.com/randx/3065552/raw/29fbd09f4605a5ea22a5a9095e35fd1938dea4d6/gistfile1.sh`
,
]
]
(
1
..
50
).
each
do
|
i
|
(
1
..
50
).
each
do
|
i
|
...
...
features/project/snippets.feature
View file @
68e4df70
...
@@ -30,6 +30,5 @@ Feature: Project Snippets
...
@@ -30,6 +30,5 @@ Feature: Project Snippets
Scenario
:
I
destroy
"Snippet one"
Scenario
:
I
destroy
"Snippet one"
Given
I visit snippet page
"Snippet one"
Given
I visit snippet page
"Snippet one"
And
I click link
"Edit"
And
I click link
"Remove Snippet"
And
I click link
"Remove Snippet"
Then
I should not see
"Snippet one"
in snippets
Then
I should not see
"Snippet one"
in snippets
features/snippets/snippets.feature
View file @
68e4df70
...
@@ -24,6 +24,5 @@ Feature: Snippets Feature
...
@@ -24,6 +24,5 @@ Feature: Snippets Feature
Scenario
:
I
destroy
"Personal snippet one"
Scenario
:
I
destroy
"Personal snippet one"
Given
I visit snippet page
"Personal snippet one"
Given
I visit snippet page
"Personal snippet one"
And
I click link
"Edit"
And
I click link
"Destroy"
And
I click link
"Destroy"
Then
I should not see
"Personal snippet one"
in snippets
Then
I should not see
"Personal snippet one"
in snippets
features/steps/project/snippets.rb
View file @
68e4df70
...
@@ -48,7 +48,7 @@ class ProjectSnippets < Spinach::FeatureSteps
...
@@ -48,7 +48,7 @@ class ProjectSnippets < Spinach::FeatureSteps
end
end
And
'I click link "Remove Snippet"'
do
And
'I click link "Remove Snippet"'
do
click_link
"
Remove snippet
"
click_link
"
remove
"
end
end
And
'I submit new snippet "Snippet three"'
do
And
'I submit new snippet "Snippet three"'
do
...
...
features/steps/snippets/snippets.rb
View file @
68e4df70
...
@@ -19,7 +19,7 @@ class SnippetsFeature < Spinach::FeatureSteps
...
@@ -19,7 +19,7 @@ class SnippetsFeature < Spinach::FeatureSteps
end
end
And
'I click link "Destroy"'
do
And
'I click link "Destroy"'
do
click_link
"
R
emove"
click_link
"
r
emove"
end
end
And
'I submit new snippet "Personal snippet three"'
do
And
'I submit new snippet "Personal snippet three"'
do
...
...
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