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
14649525
Commit
14649525
authored
Jul 19, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix comments in MR. Fixed event destroy with user
parent
214fdd2d
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
24 additions
and
15 deletions
+24
-15
app/assets/javascripts/note.js
app/assets/javascripts/note.js
+2
-2
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+2
-1
app/assets/stylesheets/header.scss
app/assets/stylesheets/header.scss
+7
-4
app/controllers/admin/projects_controller.rb
app/controllers/admin/projects_controller.rb
+1
-1
app/models/user.rb
app/models/user.rb
+5
-0
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+3
-3
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+2
-2
app/views/notes/_form.html.haml
app/views/notes/_form.html.haml
+1
-1
app/views/notes/_per_line_form.html.haml
app/views/notes/_per_line_form.html.haml
+1
-1
No files found.
app/assets/javascripts/note.js
View file @
14649525
...
...
@@ -25,11 +25,11 @@ init:
$
(
this
).
closest
(
'
li
'
).
fadeOut
();
});
$
(
"
#new_note
"
).
live
(
"
ajax:before
"
,
function
(){
$
(
"
#
submit_note
"
).
attr
(
"
disabled
"
,
"
disabled
"
);
$
(
"
.
submit_note
"
).
attr
(
"
disabled
"
,
"
disabled
"
);
})
$
(
"
#new_note
"
).
live
(
"
ajax:complete
"
,
function
(){
$
(
"
#
submit_note
"
).
removeAttr
(
"
disabled
"
);
$
(
"
.
submit_note
"
).
removeAttr
(
"
disabled
"
);
})
$
(
"
#note_note
"
).
live
(
"
focus
"
,
function
(){
...
...
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
14649525
...
...
@@ -213,6 +213,7 @@ a:focus {
.cblack
{
color
:
#111
;
}
.cdark
{
color
:
#444
}
.cwhite
{
color
:
#fff
!
important
}
.bgred
{
background
:
#F2DEDE
!
important
}
/** COMMON STYLES **/
.left
{
...
...
@@ -650,7 +651,7 @@ p {
h3
.page_title
{
color
:
#456
;
font-size
:
20px
;
font-weight
:
600
;
font-weight
:
normal
;
line-height
:
28px
;
}
...
...
app/assets/stylesheets/header.scss
View file @
14649525
...
...
@@ -96,7 +96,7 @@ header {
*/
.search
{
float
:
right
;
margin-right
:
5
5
px
;
margin-right
:
5
0
px
;
.search-input
{
@extend
.span2
;
...
...
@@ -125,11 +125,14 @@ header {
display
:
block
;
cursor
:
pointer
;
img
{
-moz-box-shadow
:
0
0
5px
#ccc
;
-webkit-box-shadow
:
0
0
5px
#ccc
;
box-shadow
:
0
0
5px
#ccc
;
border-radius
:
4px
;
right
:
0
px
;
right
:
5
px
;
position
:
absolute
;
width
:
3
3
px
;
height
:
3
3
px
;
width
:
3
1
px
;
height
:
3
1
px
;
display
:
block
;
top
:
0
;
&
:after
{
...
...
app/controllers/admin/projects_controller.rb
View file @
14649525
...
...
@@ -6,7 +6,7 @@ class Admin::ProjectsController < ApplicationController
def
index
@admin_projects
=
Project
.
scoped
@admin_projects
=
@admin_projects
.
search
(
params
[
:name
])
if
params
[
:name
].
present?
@admin_projects
=
@admin_projects
.
page
(
params
[
:page
])
@admin_projects
=
@admin_projects
.
page
(
params
[
:page
])
.
per
(
20
)
end
def
show
...
...
app/models/user.rb
View file @
14649525
...
...
@@ -15,6 +15,11 @@ class User < ActiveRecord::Base
has_many
:my_own_projects
,
:class_name
=>
"Project"
,
:foreign_key
=>
:owner_id
has_many
:keys
,
:dependent
=>
:destroy
has_many
:events
,
:class_name
=>
"Event"
,
:foreign_key
=>
:author_id
,
:dependent
=>
:destroy
has_many
:recent_events
,
:class_name
=>
"Event"
,
:foreign_key
=>
:author_id
,
...
...
app/views/admin/projects/index.html.haml
View file @
14649525
...
...
@@ -13,8 +13,8 @@
%th
Team Members
%th
Post Receive
%th
Last Commit
%th
%th
%th
Edit
%th
.cred
Danger Zone!
-
@admin_projects
.
each
do
|
project
|
%tr
...
...
@@ -24,5 +24,5 @@
%td
=
check_box_tag
:post_receive_file
,
1
,
project
.
has_post_receive_file?
,
:disabled
=>
true
%td
=
last_commit
(
project
)
%td
=
link_to
'Edit'
,
edit_admin_project_path
(
project
),
:id
=>
"edit_
#{
dom_id
(
project
)
}
"
,
:class
=>
"btn small"
%td
=
link_to
'Destroy'
,
[
:admin
,
project
],
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"btn small danger"
%td
.bgred
=
link_to
'Destroy'
,
[
:admin
,
project
],
:confirm
=>
"REMOVE
#{
project
.
name
}
? Are you sure?"
,
:method
=>
:delete
,
:class
=>
"btn small danger"
=
paginate
@admin_projects
,
:theme
=>
"admin"
app/views/admin/users/index.html.haml
View file @
14649525
...
...
@@ -27,7 +27,7 @@
%th
Projects
%th
Edit
%th
Blocked
%th
%th
.cred
Danger Zone!
-
@admin_users
.
each
do
|
user
|
%tr
...
...
@@ -41,6 +41,6 @@
=
link_to
'Unblock'
,
unblock_admin_user_path
(
user
),
:method
=>
:put
,
:class
=>
"btn small success"
-
else
=
link_to
'Block'
,
block_admin_user_path
(
user
),
:confirm
=>
'USER WILL BE BLOCKED! Are you sure?'
,
:method
=>
:put
,
:class
=>
"btn small danger"
%td
=
link_to
'Destroy'
,
[
:admin
,
user
],
:confirm
=>
'USER WILL BE REMOVED! Are you sure?'
,
:method
=>
:delete
,
:class
=>
"btn small danger"
%td
.bgred
=
link_to
'Destroy'
,
[
:admin
,
user
],
:confirm
=>
"USER
#{
user
.
name
}
WILL BE REMOVED! Are you sure?"
,
:method
=>
:delete
,
:class
=>
"btn small danger"
=
paginate
@admin_users
,
:theme
=>
"admin"
app/views/notes/_form.html.haml
View file @
14649525
...
...
@@ -32,4 +32,4 @@
%span
Any file less than 10 MB
=
f
.
submit
'Add Comment'
,
:class
=>
"btn primary"
,
:id
=>
"submit_note"
=
f
.
submit
'Add Comment'
,
:class
=>
"btn primary
submit_note
"
,
:id
=>
"submit_note"
app/views/notes/_per_line_form.html.haml
View file @
14649525
...
...
@@ -24,7 +24,7 @@
=
check_box_tag
:notify_author
,
1
,
@note
.
noteable_type
==
"Commit"
%span
Commit author
.actions
=
f
.
submit
'Add note'
,
:class
=>
"btn primary"
,
:id
=>
"submit_note"
=
f
.
submit
'Add note'
,
:class
=>
"btn primary
submit_note
"
,
:id
=>
"submit_note"
=
link_to
"Close"
,
"#"
,
:class
=>
"btn hide-button"
:javascript
...
...
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