Download as
Browse Code »

Commit 2587de74df824b8c81b9d51a3bd47fd246173e29

Authored by Dmitriy Zaporozhets
1 parent 627efddf
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Minor fixes

Showing 15 changed files with 145 additions and 61 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @2587de7
... ... @@ -880,3 +880,17 @@ li.note {
880 880 color:#aaa;
881 881 }
882 882 }
  883 +
  884 +.remember_me {
  885 + text-align:left;
  886 +}
  887 +
  888 +
  889 +/**
  890 + * Milestones list
  891 + *
  892 + */
  893 +
  894 +.milestone {
  895 + @extend .wll;
  896 +}
... ...
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @2587de7
... ... @@ -35,6 +35,10 @@ a {
35 35 }
36 36 }
37 37  
  38 +.neib {
  39 + margin-right:10px;
  40 +}
  41 +
38 42 .alert-message {
39 43 @extend .alert;
40 44  
... ... @@ -111,7 +115,9 @@ table {
111 115 background:$blue_link;
112 116 }
113 117 }
114   - &.danger,
  118 + &.primary {
  119 + @extend .btn-primary;
  120 + }
115 121 &.btn-danger {
116 122 background:#DD4B39;
117 123 color:white;
... ... @@ -122,6 +128,9 @@ table {
122 128 background:#DD0000;
123 129 }
124 130 }
  131 + &.danger {
  132 + @extend .btn-danger;
  133 + }
125 134  
126 135 &.small {
127 136 @extend .btn-small;
... ...
app/assets/stylesheets/jquery_ui.scss
  Diff comments   View file @2587de7
... ... @@ -22,6 +22,8 @@
22 22 .ui-progressbar {
23 23 border:1px solid #ddd;
24 24 height:6px;
  25 + margin:0;
  26 + padding:0;
25 27  
26 28 .ui-progressbar-value {
27 29 background-color: #62C462;//$blue_link;
... ...
app/assets/stylesheets/notes.scss
  Diff comments   View file @2587de7
... ... @@ -90,6 +90,7 @@ tr.line_notes_row {
90 90  
91 91 .per_line_form {
92 92 background:#f5f5f5;
  93 + border-top:1px solid #eee;
93 94 form { margin: 0; }
94 95 td {
95 96 border-bottom:1px solid #ddd;
... ...
app/assets/stylesheets/tree.scss
  Diff comments   View file @2587de7
... ... @@ -135,6 +135,7 @@
135 135  
136 136 img {
137 137 position: relative;
  138 + top:-1px;
138 139 }
139 140 }
140 141 }
... ... @@ -161,7 +162,7 @@
161 162 border-color:#ccc;
162 163  
163 164 td {
164   - padding:7px;
  165 + padding:8px;
165 166 border-color:#f1f1f1;
166 167 background:#fafafa;
167 168 }
... ...
app/views/dashboard/_issues.html.haml 0 → 100644
  Diff comments   View file @2587de7
... ... @@ -0,0 +1,17 @@
  1 +%div.ui-box
  2 + %h5
  3 + = link_to "Issues" , "#issues", :id => "issues"
  4 + %small (assigned to you)
  5 + %ul.unstyled
  6 + - @issues.each do |issue|
  7 + %li.wll
  8 + = link_to [issue.project, issue] do
  9 + %p
  10 + %span.btn.disabled.small= issue.project.name
  11 + %strong
  12 + –
  13 + Issue #
  14 + = issue.id
  15 + = truncate issue.title, :length => 50
  16 + %span.right.cgray
  17 + = issue.updated_at.stamp("Aug 21, 2011")
... ...
app/views/dashboard/_merge_requests.html.haml 0 → 100644
  Diff comments   View file @2587de7
... ... @@ -0,0 +1,20 @@
  1 +%div.ui-box
  2 + %h5
  3 + = link_to "5 Latest Merge Requests" , "#merge_requests", :id => "merge_requests"
  4 + %small (authored or assigned to you)
  5 + %ul.unstyled
  6 + - @merge_requests.each do |merge_request|
  7 + %li.wll
  8 + = link_to [merge_request.project, merge_request] do
  9 + %p
  10 + %span.btn.disabled.small= merge_request.project.name
  11 + %strong
  12 + –
  13 + Merge Request ##{merge_request.id}
  14 + = truncate merge_request.title, :length => 50
  15 + %span.right.cgray
  16 + = merge_request.updated_at.stamp("Aug 21, 2011")
  17 +
  18 + %li.bottom
  19 +
  20 +
... ...
app/views/dashboard/_projects.html.haml 0 → 100644
  Diff comments   View file @2587de7
... ... @@ -0,0 +1,22 @@
  1 +%div
  2 + %h3
  3 + %span.ico.projects
  4 + Projects
  5 + %small
  6 + (most recent)
  7 + %hr
  8 + %div.dash_projects
  9 + - projects.first(5).each do |project|
  10 + %div.dash_project
  11 + %h4
  12 + = link_to project, :class => "project_link" do
  13 + = truncate project.name, :length => 30
  14 + %small
  15 + last activity at
  16 + = project.last_activity_date.stamp("Aug 25, 2011")
  17 +
  18 + .right
  19 + %small
  20 + %strong= link_to "Browse Code »", tree_project_ref_path(project, project.root_ref), :class => "neib"
  21 + %strong= link_to "Commits »", project_commits_path(project)
  22 +
... ...
app/views/devise/sessions/new.html.erb
  Diff comments   View file @2587de7
... ... @@ -4,7 +4,7 @@
4 4 <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %>
5 5  
6 6 <% if devise_mapping.rememberable? -%>
7   - <div class="clearfix inputs-list"> <label for="user_remember_me"><%= f.check_box :remember_me %><span>Remember me</span></label></div>
  7 + <div class="clearfix inputs-list"> <label class="checkbox remember_me" for="user_remember_me"><%= f.check_box :remember_me %><span>Remember me</span></label></div>
8 8 <% end -%>
9 9 <br/>
10 10 <%= f.submit "Sign in", :class => "primary btn" %>
... ...
app/views/help/permissions.html.haml
  Diff comments   View file @2587de7
... ... @@ -2,14 +2,14 @@
2 2 %hr
3 3  
4 4 .row
5   - .ui-box.span3
  5 + .ui-box.span2
6 6 %h5 Guest
7 7 %ul.unstyled
8 8 %li Create new issue
9 9 %li Leave comments
10 10 %li Write on project wall
11 11  
12   - .ui-box.span4
  12 + .ui-box.span3
13 13 %h5 Reporter
14 14 %ul.unstyled
15 15 %li Pull project code
... ... @@ -20,7 +20,7 @@
20 20 %li Create a code snippets
21 21  
22 22  
23   - .ui-box.span4
  23 + .ui-box.span3
24 24 %h5 Developer
25 25 %ul.unstyled
26 26 %li Pull project code
... ... @@ -33,7 +33,7 @@
33 33 %li Write on project wall
34 34 %li Write a wiki
35 35  
36   - .ui-box.span4
  36 + .ui-box.span3
37 37 %h5 Master
38 38 %ul.unstyled
39 39 %li Full repository access
... ...
app/views/issues/index.html.haml
  Diff comments   View file @2587de7
... ... @@ -7,16 +7,15 @@
7 7 = image_tag "Rss-UI.PNG", :width => 16, :title => "feed"
8 8  
9 9 .right
10   - .span4.left
11   - = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :id => "issue_search_form", :class => :left do
  10 + .span5
  11 + - if can? current_user, :write_issue, @project
  12 + = link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do
  13 + New Issue
  14 + = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :id => "issue_search_form", :class => :right do
12 15 = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
13 16 = hidden_field_tag :status, params[:f]
14   - = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
  17 + = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search span3 right neib' }
15 18  
16   - - if can? current_user, :write_issue, @project
17   - .span2.left
18   - = link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do
19   - New Issue
20 19 %br
21 20 %div#issues-table-holder.ui-box
22 21 .title
... ...
app/views/milestones/_milestone.html.haml
  Diff comments   View file @2587de7
1   -%li{:class => "wll", :id => dom_id(milestone) }
  1 +%li{:class => "milestone", :id => dom_id(milestone) }
2 2 .right
3 3 - if milestone.issues.count > 0
4 4 = link_to 'Browse Issues', project_issues_path(milestone.project, :milestone_id => milestone.id), :class => "btn small"
... ... @@ -10,9 +10,10 @@
10 10 %h4.row_title
11 11 = truncate(milestone.title, :length => 100)
12 12 %small= milestone.expires_at
  13 + %br
  14 + .progress.span3
13 15  
14   - .progress.span4
15   -
  16 + &nbsp;
16 17 :javascript
17 18 $(function() {
18 19 $( "##{dom_id(milestone)} .progress" ).progressbar({
... ...
app/views/notes/_per_line_form.html.haml
  Diff comments   View file @2587de7
... ... @@ -3,31 +3,29 @@
3 3 %td{:colspan => 3 }
4 4 = form_for [@project, @note], :remote => "true", :multipart => true do |f|
5 5 %h3 Leave a note
6   - .row
7   - .span16
8   - -if @note.errors.any?
9   - .alert-message.block-message.error
10   - - @note.errors.full_messages.each do |msg|
11   - %div= msg
  6 + %div.span10
  7 + -if @note.errors.any?
  8 + .alert-message.block-message.error
  9 + - @note.errors.full_messages.each do |msg|
  10 + %div= msg
12 11  
13   - = f.hidden_field :noteable_id
14   - = f.hidden_field :noteable_type
15   - = f.hidden_field :line_code
16   - = f.text_area :note, :size => 255
17   - .actions
18   - = f.submit 'Add note', :class => "btn primary", :id => "submit_note"
19   - = link_to "Close", "#", :class => "btn hide-button"
20   - .span6.entry
21   - %h5 Notify via email:
22   - .clearfix
23   - = label_tag :notify do
24   - = check_box_tag :notify, 1, @note.noteable_type != "Commit"
25   - %span Project team
  12 + = f.hidden_field :noteable_id
  13 + = f.hidden_field :noteable_type
  14 + = f.hidden_field :line_code
  15 + = f.text_area :note, :size => 255
  16 + %h5 Notify via email:
  17 + .clearfix
  18 + = label_tag :notify do
  19 + = check_box_tag :notify, 1, @note.noteable_type != "Commit"
  20 + %span Project team
26 21  
27   - - if @note.notify_only_author?(current_user)
28   - = label_tag :notify_author do
29   - = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
30   - %span Commit author
  22 + - if @note.notify_only_author?(current_user)
  23 + = label_tag :notify_author do
  24 + = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
  25 + %span Commit author
  26 + .actions
  27 + = f.submit 'Add note', :class => "btn primary", :id => "submit_note"
  28 + = link_to "Close", "#", :class => "btn hide-button"
31 29  
32 30 :javascript
33 31 $(function(){
... ...
app/views/refs/_tree.html.haml
  Diff comments   View file @2587de7
... ... @@ -13,7 +13,7 @@
13 13 = render :partial => "refs/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
14 14 - else
15 15 - contents = tree.contents
16   - %table#tree-slider.bordered-table
  16 + %table#tree-slider.bordered-table.table
17 17 %thead
18 18 %th Name
19 19 %th Last Update
... ...
db/schema.rb
  Diff comments   View file @2587de7
... ... @@ -30,8 +30,8 @@ ActiveRecord::Schema.define(:version =&gt; 20120408181910) do
30 30 t.integer "assignee_id"
31 31 t.integer "author_id"
32 32 t.integer "project_id"
33   - t.datetime "created_at"
34   - t.datetime "updated_at"
  33 + t.datetime "created_at", :null => false
  34 + t.datetime "updated_at", :null => false
35 35 t.boolean "closed", :default => false, :null => false
36 36 t.integer "position", :default => 0
37 37 t.boolean "critical", :default => false, :null => false
... ... @@ -44,8 +44,8 @@ ActiveRecord::Schema.define(:version =&gt; 20120408181910) do
44 44  
45 45 create_table "keys", :force => true do |t|
46 46 t.integer "user_id"
47   - t.datetime "created_at"
48   - t.datetime "updated_at"
  47 + t.datetime "created_at", :null => false
  48 + t.datetime "updated_at", :null => false
49 49 t.text "key"
50 50 t.string "title"
51 51 t.string "identifier"
... ... @@ -60,10 +60,10 @@ ActiveRecord::Schema.define(:version =&gt; 20120408181910) do
60 60 t.integer "assignee_id"
61 61 t.string "title"
62 62 t.boolean "closed", :default => false, :null => false
63   - t.datetime "created_at"
64   - t.datetime "updated_at"
65   - t.text "st_commits", :limit => 4294967295
66   - t.text "st_diffs", :limit => 4294967295
  63 + t.datetime "created_at", :null => false
  64 + t.datetime "updated_at", :null => false
  65 + t.text "st_commits", :limit => 2147483647
  66 + t.text "st_diffs", :limit => 2147483647
67 67 t.boolean "merged", :default => false, :null => false
68 68 end
69 69  
... ... @@ -84,8 +84,8 @@ ActiveRecord::Schema.define(:version =&gt; 20120408181910) do
84 84 t.string "noteable_id"
85 85 t.string "noteable_type"
86 86 t.integer "author_id"
87   - t.datetime "created_at"
88   - t.datetime "updated_at"
  87 + t.datetime "created_at", :null => false
  88 + t.datetime "updated_at", :null => false
89 89 t.integer "project_id"
90 90 t.string "attachment"
91 91 t.string "line_code"
... ... @@ -98,8 +98,8 @@ ActiveRecord::Schema.define(:version =&gt; 20120408181910) do
98 98 t.string "name"
99 99 t.string "path"
100 100 t.text "description"
101   - t.datetime "created_at"
102   - t.datetime "updated_at"
  101 + t.datetime "created_at", :null => false
  102 + t.datetime "updated_at", :null => false
103 103 t.boolean "private_flag", :default => true, :null => false
104 104 t.string "code"
105 105 t.integer "owner_id"
... ... @@ -122,8 +122,8 @@ ActiveRecord::Schema.define(:version =&gt; 20120408181910) do
122 122 t.text "content"
123 123 t.integer "author_id", :null => false
124 124 t.integer "project_id", :null => false
125   - t.datetime "created_at"
126   - t.datetime "updated_at"
  125 + t.datetime "created_at", :null => false
  126 + t.datetime "updated_at", :null => false
127 127 t.string "file_name"
128 128 t.datetime "expires_at"
129 129 end
... ... @@ -156,8 +156,8 @@ ActiveRecord::Schema.define(:version =&gt; 20120408181910) do
156 156 t.datetime "last_sign_in_at"
157 157 t.string "current_sign_in_ip"
158 158 t.string "last_sign_in_ip"
159   - t.datetime "created_at"
160   - t.datetime "updated_at"
  159 + t.datetime "created_at", :null => false
  160 + t.datetime "updated_at", :null => false
161 161 t.string "name"
162 162 t.boolean "admin", :default => false, :null => false
163 163 t.integer "projects_limit", :default => 10
... ... @@ -176,16 +176,16 @@ ActiveRecord::Schema.define(:version =&gt; 20120408181910) do
176 176 create_table "users_projects", :force => true do |t|
177 177 t.integer "user_id", :null => false
178 178 t.integer "project_id", :null => false
179   - t.datetime "created_at"
180   - t.datetime "updated_at"
  179 + t.datetime "created_at", :null => false
  180 + t.datetime "updated_at", :null => false
181 181 t.integer "project_access", :default => 0, :null => false
182 182 end
183 183  
184 184 create_table "web_hooks", :force => true do |t|
185 185 t.string "url"
186 186 t.integer "project_id"
187   - t.datetime "created_at"
188   - t.datetime "updated_at"
  187 + t.datetime "created_at", :null => false
  188 + t.datetime "updated_at", :null => false
189 189 end
190 190  
191 191 create_table "wikis", :force => true do |t|
... ...