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
Boxiang Sun
gitlab-ce
Commits
f088eaa9
Commit
f088eaa9
authored
Aug 21, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactoring & minor css changes
parent
7fa6a234
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
4 deletions
+21
-4
CHANGELOG
CHANGELOG
+5
-0
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+5
-1
app/assets/stylesheets/themes/ui_mars.scss
app/assets/stylesheets/themes/ui_mars.scss
+8
-0
app/models/project.rb
app/models/project.rb
+1
-1
app/roles/push_observer.rb
app/roles/push_observer.rb
+1
-1
app/views/team_members/_show.html.haml
app/views/team_members/_show.html.haml
+1
-1
No files found.
CHANGELOG
View file @
f088eaa9
...
@@ -3,6 +3,11 @@ v 2.8.0
...
@@ -3,6 +3,11 @@ v 2.8.0
- Bulk issues update
- Bulk issues update
- Issues API
- Issues API
- Cucumber coverage increased
- Cucumber coverage increased
- Post-receive files fixed
- UI improved
- Application cleanup
- more cucumber
- capybara-webkit + headless
v 2.7.0
v 2.7.0
- Issue Labels
- Issue Labels
...
...
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
f088eaa9
...
@@ -330,16 +330,20 @@ img.avatar {
...
@@ -330,16 +330,20 @@ img.avatar {
float
:left
;
float
:left
;
margin-right
:
15px
;
margin-right
:
15px
;
width
:
40px
;
width
:
40px
;
border
:
2px
solid
#ddd
;
border
:
1px
solid
#ddd
;
padding
:
1px
;
&
.s16
{
&
.s16
{
width
:
16px
;
width
:
16px
;
height
:
16px
;
}
}
&
.s24
{
&
.s24
{
width
:
24px
;
width
:
24px
;
height
:
24px
;
}
}
&
.s32
{
&
.s32
{
width
:
32px
;
width
:
32px
;
height
:
32px
;
}
}
}
}
...
...
app/assets/stylesheets/themes/ui_mars.scss
View file @
f088eaa9
...
@@ -20,6 +20,10 @@
...
@@ -20,6 +20,10 @@
.fbtn
{
.fbtn
{
.btn
{
.btn
{
i
{
position
:
relative
;
top
:
1px
;
}
margin-left
:
8px
;
margin-left
:
8px
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#595D63
)
,
to
(
#31363E
));
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#595D63
)
,
to
(
#31363E
));
background-image
:
-webkit-linear-gradient
(
#595D63
6
.6%
,
#31363E
);
background-image
:
-webkit-linear-gradient
(
#595D63
6
.6%
,
#31363E
);
...
@@ -32,6 +36,10 @@
...
@@ -32,6 +36,10 @@
background-image
:
-moz-linear-gradient
(
#595D63
6
.6%
,
#202227
);
background-image
:
-moz-linear-gradient
(
#595D63
6
.6%
,
#202227
);
background-image
:
-o-linear-gradient
(
#595D63
6
.6%
,
#202227
);
background-image
:
-o-linear-gradient
(
#595D63
6
.6%
,
#202227
);
background-position
:
0
0
;
background-position
:
0
0
;
color
:
#fff
;
i
{
@extend
.icon-white
;
}
}
}
border
:
1px
solid
#31363E
;
border
:
1px
solid
#31363E
;
...
...
app/models/project.rb
View file @
f088eaa9
...
@@ -2,7 +2,7 @@ require "grit"
...
@@ -2,7 +2,7 @@ require "grit"
class
Project
<
ActiveRecord
::
Base
class
Project
<
ActiveRecord
::
Base
include
Repository
include
Repository
include
P
rojectPush
include
P
ushObserver
include
Authority
include
Authority
include
Team
include
Team
...
...
app/roles/p
roject_push
.rb
→
app/roles/p
ush_observer
.rb
View file @
f088eaa9
module
P
rojectPush
module
P
ushObserver
def
observe_push
(
oldrev
,
newrev
,
ref
,
user
)
def
observe_push
(
oldrev
,
newrev
,
ref
,
user
)
data
=
post_receive_data
(
oldrev
,
newrev
,
ref
,
user
)
data
=
post_receive_data
(
oldrev
,
newrev
,
ref
,
user
)
...
...
app/views/team_members/_show.html.haml
View file @
f088eaa9
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
%span
.label
Blocked
%span
.label
Blocked
=
link_to
project_team_member_path
(
@project
,
member
),
title:
user
.
name
,
class:
"dark"
do
=
link_to
project_team_member_path
(
@project
,
member
),
title:
user
.
name
,
class:
"dark"
do
=
image_tag
gravatar_icon
(
user
.
email
,
40
),
class:
"avatar"
=
image_tag
gravatar_icon
(
user
.
email
,
40
),
class:
"avatar
s32
"
=
link_to
project_team_member_path
(
@project
,
member
),
title:
user
.
name
,
class:
"dark"
do
=
link_to
project_team_member_path
(
@project
,
member
),
title:
user
.
name
,
class:
"dark"
do
%strong
=
truncate
(
user
.
name
,
lenght:
40
)
%strong
=
truncate
(
user
.
name
,
lenght:
40
)
%br
%br
...
...
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