kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed styles, ProjectHook specs etc

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-05 00:35:38 +02:00
parent c6298678f5
commit e16cebac3e
22 changed files with 111 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
View file

@ -79,13 +79,44 @@
}
.title {
padding: 0 10px;
@include bg-gray-gradient;
border-bottom: 1px solid #CCC;
color: #456;
font-size: 16px;
text-shadow: 0 1px 1px #fff;
padding: 0px 10px;
line-height: 36px;
font-size: 14px;
font-weight: normal;
> a {
text-shadow: 0 1px 1px #fff;
}
form {
margin-bottom: 0;
margin-top: 3px;
}
.nav-pills {
> li {
> a {
padding: 13px;
margin: 0;
font-size: 13px;
}
&.active {
> a {
background: #D5D5D5;
color: $style_color;
@include border-radius(0);
border-radius: 0;
border-left: 1px solid #CCC;
border-right: 1px solid #CCC;
}
}
}
}
}
&.padded {

4
app/assets/stylesheets/gitlab_bootstrap/lists.scss
View file

@ -25,6 +25,10 @@
&:last-child {
border-bottom: none;
&.bottom {
background: #f5f5f5;
}
}
.author { color: #999; }

2
app/assets/stylesheets/gitlab_bootstrap/tables.scss
View file

@ -25,7 +25,7 @@ table {
}
th, td {
padding: 8px;
padding: 10px;
line-height: 18px;
text-align: left;
}

14
app/assets/stylesheets/sections/issues.scss
View file

@ -61,31 +61,25 @@ input.check_all_issues {
#issues-table-holder {
.issues_filters {
form {
padding: 0;
margin: 0;
margin-top:7px
}
}
.issues_bulk_update {
margin: 0;
form {
padding: 0;
margin: 0;
margin-top:7px
float:left;
}
.update_selected_issues {
position: relative;
top:-2px;
top:5px;
margin-left: 4px;
float: left;
}
.update_issues_text {
padding: 3px;
line-height: 18px;
line-height: 28px;
float: left;
color: #479;
}
}
}

8
app/assets/stylesheets/sections/projects.scss
View file

@ -8,14 +8,8 @@
.groups_box,
.projects_box {
> h5 {
color: #456;
font-size: 16px;
text-shadow: 0 1px 1px #fff;
> .title {
padding: 2px 15px;
line-height: 36px;
font-size: 14px;
font-weight: normal;
}
.nav-projects-tabs li { padding: 0; }
.well-list {

8
app/models/commit.rb
View file

@ -98,6 +98,8 @@ class Commit
end
def initialize(raw_commit, head = nil)
raise "Nil as raw commit passed" unless raw_commit
@commit = raw_commit
@head = head
end
@ -136,7 +138,11 @@ class Commit
end
def prev_commit
parents.try :first
@prev_commit ||= if parents.present?
Commit.new(parents.first)
else
nil
end
end
def prev_commit_id

4
app/models/project.rb
View file

@ -361,8 +361,8 @@ class Project < ActiveRecord::Base
# Discover the default branch, but only if it hasn't already been set to
# something else
if default_branch.nil?
update_attributes(default_branch: discover_default_branch)
if repository && default_branch.nil?
update_attributes(default_branch: self.repository.discover_default_branch)
end
end

8
app/views/admin/dashboard/index.html.haml
View file

@ -1,7 +1,7 @@
.admin_dash.row
.span3
.ui-box
%h5 Projects
%h5.title Projects
.data.padded
= link_to admin_projects_path do
%h1= Project.count
@ -9,7 +9,7 @@
= link_to 'New Project', new_project_path, class: "btn small"
.span3
.ui-box
%h5 Groups
%h5.title Groups
.data.padded
= link_to admin_groups_path do
%h1= Group.count
@ -17,7 +17,7 @@
= link_to 'New Group', new_admin_group_path, class: "btn small"
.span3
.ui-box
%h5 Users
%h5.title Users
.data.padded
= link_to admin_users_path do
%h1= User.count
@ -25,7 +25,7 @@
= link_to 'New User', new_admin_user_path, class: "btn small"
.span3
.ui-box
%h5
%h5.title
Resque Workers
.data.padded
- if @resque_accessible

27
app/views/admin/projects/show.html.haml
View file

@ -4,7 +4,7 @@
%i.icon-edit
Edit
- if @repository.has_commits?
- if @repository && @repository.has_commits?
- if !@repository.has_post_receive_file?
%br
.alert.alert-error
@ -65,18 +65,6 @@
Created at:
%td
= @project.created_at.stamp("March 1, 1999")
%table.zebra-striped
%thead
%tr
%th Repository
%th
%tr
%td
%b
FS Path:
%td
%code= @repository.path_to_repo
%tr
%td
%b
@ -89,6 +77,19 @@
SSH:
%td
= link_to @project.ssh_url_to_repo
- if @repository
%table.zebra-striped
%thead
%tr
%th Repository
%th
%tr
%td
%b
FS Path:
%td
%code= @repository.path_to_repo
%tr
%td
%b

2
app/views/commits/_commits.html.haml
View file

@ -1,6 +1,6 @@
- @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits|
%div.ui-box
%h6.title
%h5.title
%i.icon-calendar
= day.stamp("28 Aug, 2010")
%ul.well-list= render commits

3
app/views/dashboard/issues.html.haml
View file

@ -13,7 +13,8 @@
- @issues.group_by(&:project).each do |group|
%div.ui-box
- @project = group[0]
%h5= link_to_project @project
%h5.title
= link_to_project @project
%ul.well-list.issues_table
- group[1].each do |issue|
= render(partial: 'issues/show', locals: {issue: issue})

3
app/views/dashboard/merge_requests.html.haml
View file

@ -12,7 +12,8 @@
- @merge_requests.group_by(&:project).each do |group|
.ui-box
- @project = group[0]
%h5= link_to_project @project
%h5.title
= link_to_project @project
%ul.well-list
- group[1].each do |merge_request|
= render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})

2
app/views/groups/_projects.html.haml
View file

@ -1,5 +1,5 @@
.projects_box
%h5
%h5.title
Projects
%small
(#{projects.count})

3
app/views/groups/issues.html.haml
View file

@ -9,7 +9,8 @@
- @issues.group_by(&:project).each do |group|
%div.ui-box
- @project = group[0]
%h5= @project.name
%h5.title
= @project.name
%ul.well-list.issues_table
- group[1].each do |issue|
= render(partial: 'issues/show', locals: {issue: issue})

3
app/views/groups/merge_requests.html.haml
View file

@ -8,7 +8,8 @@
- @merge_requests.group_by(&:project).each do |group|
%ul.well-list.ui-box
- @project = group[0]
%h5= @project.name
%h5.title
= @project.name
- group[1].each do |merge_request|
= render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})
%hr

2
app/views/groups/people.html.haml
View file

@ -5,7 +5,7 @@
- if can?(current_user, :manage_group, @group)
= render (@project ? "new_member" : "new_group_member")
.ui-box
%h5
%h5.title
Team
%small
(#{@users.size})

2
app/views/issues/index.html.haml
View file

@ -30,7 +30,7 @@
= select_tag('update[milestone_id]', options_from_collection_for_select(issues_active_milestones, "id", "title", params[:milestone_id]), prompt: "Milestone")
= hidden_field_tag 'update[issues_ids]', []
= hidden_field_tag :f, params[:f]
= button_tag "Save", class: "btn update_selected_issues"
= button_tag "Save", class: "btn update_selected_issues btn-small save-btn"
.issues_filters
.left
%ul.nav.nav-pills.left

2
app/views/merge_requests/show/_commits.html.haml
View file

@ -1,6 +1,6 @@
- if @commits.present?
.ui-box
%h6.title
%h5.title
%i.icon-list
Commits (#{@commits.count})
.merge-request-commits

2
app/views/team_members/_team.html.haml
View file

@ -1,6 +1,6 @@
- grouper_project_members(@project).each do |access, members|
.ui-box
%h5
%h5.title
= Project.access_options.key(access).pluralize
%small= members.size
%ul.well-list

2
lib/static_model.rb
View file

@ -38,7 +38,7 @@ module StaticModel
end
def ==(other)
if other.is_a? StaticModel
if other.is_a? ::StaticModel
id == other.id
else
super

2
spec/lib/extracts_path_spec.rb
View file

@ -7,7 +7,7 @@ describe ExtractsPath do
before do
@project = project
project.stub(:ref_names).and_return(['master', 'foo/bar/baz', 'v1.0.0', 'v2.0.0'])
project.stub(repository: stub(ref_names: ['master', 'foo/bar/baz', 'v1.0.0', 'v2.0.0']))
project.stub(path_with_namespace: 'gitlab/gitlab-ci')
end

5
spec/models/project_hooks_spec.rb
View file

@ -71,8 +71,9 @@ describe Project, "Hooks" do
context "when gathering commit data" do
before do
@oldrev, @newrev, @ref = project.fresh_commits(2).last.sha, project.fresh_commits(2).first.sha, 'refs/heads/master'
@commit = project.fresh_commits(2).first
@oldrev, @newrev, @ref = project.repository.fresh_commits(2).last.sha,
project.repository.fresh_commits(2).first.sha, 'refs/heads/master'
@commit = project.repository.fresh_commits(2).first
# Fill nil/empty attributes
project.description = "This is a description"