Commit 1b1a408a717b6ad1ca3f15bf1b13b8251a5a33e4

Authored by Dmitriy Zaporozhets
1 parent 447b46ca

Convert span into col-md

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 41 changed files with 96 additions and 96 deletions   Show diff stats
app/views/admin/dashboard/index.html.haml
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 You can manage projects, users and other GitLab data from here. 4 You can manage projects, users and other GitLab data from here.
5 %hr 5 %hr
6 .admin_dash.row 6 .admin_dash.row
7 - .span4 7 + .col-md-4
8 .light-well 8 .light-well
9 %h4 Projects 9 %h4 Projects
10 .data 10 .data
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 %h1= Project.count 12 %h1= Project.count
13 %hr 13 %hr
14 = link_to 'New Project', new_project_path, class: "btn btn-new" 14 = link_to 'New Project', new_project_path, class: "btn btn-new"
15 - .span4 15 + .col-md-4
16 .light-well 16 .light-well
17 %h4 Users 17 %h4 Users
18 .data 18 .data
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 %h1= User.count 20 %h1= User.count
21 %hr 21 %hr
22 = link_to 'New User', new_admin_user_path, class: "btn btn-new" 22 = link_to 'New User', new_admin_user_path, class: "btn btn-new"
23 - .span4 23 + .col-md-4
24 .light-well 24 .light-well
25 %h4 Groups 25 %h4 Groups
26 .data 26 .data
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 = link_to 'New Group', new_admin_group_path, class: "btn btn-new" 30 = link_to 'New Group', new_admin_group_path, class: "btn btn-new"
31 31
32 .row.prepend-top-10 32 .row.prepend-top-10
33 - .span4 33 + .col-md-4
34 %h4 Latest projects 34 %h4 Latest projects
35 %hr 35 %hr
36 - @projects.each do |project| 36 - @projects.each do |project|
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 %span.light.pull-right 39 %span.light.pull-right
40 #{time_ago_with_tooltip(project.created_at)} 40 #{time_ago_with_tooltip(project.created_at)}
41 41
42 - .span4 42 + .col-md-4
43 %h4 Latest users 43 %h4 Latest users
44 %hr 44 %hr
45 - @users.each do |user| 45 - @users.each do |user|
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 %span.light.pull-right 49 %span.light.pull-right
50 #{time_ago_with_tooltip(user.created_at)} 50 #{time_ago_with_tooltip(user.created_at)}
51 51
52 - .span4 52 + .col-md-4
53 %h4 Latest groups 53 %h4 Latest groups
54 %hr 54 %hr
55 - @groups.each do |group| 55 - @groups.each do |group|
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 61
62 %br 62 %br
63 .row 63 .row
64 - .span4 64 + .col-md-4
65 %h4 Stats 65 %h4 Stats
66 %hr 66 %hr
67 %p 67 %p
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 Milestones 92 Milestones
93 %span.light.pull-right 93 %span.light.pull-right
94 = Milestone.count 94 = Milestone.count
95 - .span4 95 + .col-md-4
96 %h4 96 %h4
97 Features 97 Features
98 %hr 98 %hr
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
112 OmniAuth 112 OmniAuth
113 %span.light.pull-right 113 %span.light.pull-right
114 = boolean_to_icon Gitlab.config.omniauth.enabled 114 = boolean_to_icon Gitlab.config.omniauth.enabled
115 - .span4 115 + .col-md-4
116 %h4 Components 116 %h4 Components
117 %hr 117 %hr
118 %p 118 %p
app/views/admin/groups/show.html.haml
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 Edit 6 Edit
7 %hr 7 %hr
8 .row 8 .row
9 - .span6 9 + .col-md-6
10 .ui-box 10 .ui-box
11 .title 11 .title
12 Group info: 12 Group info:
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 %span.pull-right.light 44 %span.pull-right.light
45 %span.monospace= project.path_with_namespace + ".git" 45 %span.monospace= project.path_with_namespace + ".git"
46 46
47 - .span6 47 + .col-md-6
48 .ui-box 48 .ui-box
49 .title 49 .title
50 Add user(s) to the group: 50 Add user(s) to the group:
app/views/admin/projects/index.html.haml
1 .row 1 .row
2 - .span4 2 + .col-md-4
3 .admin-filter 3 .admin-filter
4 = form_tag admin_projects_path, method: :get, class: 'form-inline' do 4 = form_tag admin_projects_path, method: :get, class: 'form-inline' do
5 .control-group 5 .control-group
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 .form-actions 37 .form-actions
38 = submit_tag "Search", class: "btn submit btn-primary" 38 = submit_tag "Search", class: "btn submit btn-primary"
39 = link_to "Reset", admin_projects_path, class: "btn" 39 = link_to "Reset", admin_projects_path, class: "btn"
40 - .span8 40 + .col-md-8
41 .ui-box 41 .ui-box
42 .title 42 .title
43 Projects (#{@projects.total_count}) 43 Projects (#{@projects.total_count})
app/views/admin/projects/show.html.haml
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 Edit 5 Edit
6 %hr 6 %hr
7 .row 7 .row
8 - .span6 8 + .col-md-6
9 .ui-box 9 .ui-box
10 .title 10 .title
11 Project info: 11 Project info:
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
89 .controls 89 .controls
90 = f.submit 'Transfer', class: 'btn btn-primary' 90 = f.submit 'Transfer', class: 'btn btn-primary'
91 91
92 - .span6 92 + .col-md-6
93 - if @group 93 - if @group
94 .ui-box 94 .ui-box
95 .title 95 .title
app/views/admin/users/_form.html.haml
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 %fieldset 47 %fieldset
48 %legend Access 48 %legend Access
49 .row 49 .row
50 - .span8 50 + .col-md-8
51 .control-group 51 .control-group
52 = f.label :projects_limit 52 = f.label :projects_limit
53 .controls= f.number_field :projects_limit 53 .controls= f.number_field :projects_limit
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 = f.label :admin do 60 = f.label :admin do
61 %strong.cred Administrator 61 %strong.cred Administrator
62 .controls= f.check_box :admin 62 .controls= f.check_box :admin
63 - .span4 63 + .col-md-4
64 - unless @user.new_record? 64 - unless @user.new_record?
65 .alert.alert-error 65 .alert.alert-error
66 - if @user.blocked? 66 - if @user.blocked?
app/views/admin/users/index.html.haml
1 .row 1 .row
2 - .span3 2 + .col-md-3
3 .admin-filter 3 .admin-filter
4 = form_tag admin_users_path, method: :get, class: 'form-inline' do 4 = form_tag admin_users_path, method: :get, class: 'form-inline' do
5 = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'input-xpadding span2' 5 = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'input-xpadding span2'
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 %hr 25 %hr
26 = link_to 'Reset', admin_users_path, class: "btn btn-cancel" 26 = link_to 'Reset', admin_users_path, class: "btn btn-cancel"
27 27
28 - .span9 28 + .col-md-9
29 .ui-box 29 .ui-box
30 .title 30 .title
31 Users (#{@users.total_count}) 31 Users (#{@users.total_count})
app/views/admin/users/show.html.haml
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 %hr 13 %hr
14 14
15 .row 15 .row
16 - .span6 16 + .col-md-6
17 .ui-box 17 .ui-box
18 .title 18 .title
19 Account: 19 Account:
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 %strong #{@user.solo_owned_groups.map(&:name).join(', ')} 116 %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
117 = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove" 117 = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
118 118
119 - .span6 119 + .col-md-6
120 - if @user.users_groups.present? 120 - if @user.users_groups.present?
121 .ui-box 121 .ui-box
122 .title Groups: 122 .title Groups:
app/views/dashboard/issues.html.haml
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 %hr 7 %hr
8 8
9 .row 9 .row
10 - .span3 10 + .col-md-3
11 = render 'shared/filter', entity: 'issue' 11 = render 'shared/filter', entity: 'issue'
12 - .span9 12 + .col-md-9
13 = render 'shared/issues' 13 = render 'shared/issues'
app/views/dashboard/merge_requests.html.haml
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 List all merge requests from all project's you have access to. 7 List all merge requests from all project's you have access to.
8 %hr 8 %hr
9 .row 9 .row
10 - .span3 10 + .col-md-3
11 = render 'shared/filter', entity: 'merge_request' 11 = render 'shared/filter', entity: 'merge_request'
12 - .span9 12 + .col-md-9
13 = render 'shared/merge_requests' 13 = render 'shared/merge_requests'
app/views/dashboard/projects.html.haml
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 All projects you have access to are listed here. Public projects are not included here unless you are a member 25 All projects you have access to are listed here. Public projects are not included here unless you are a member
26 %hr 26 %hr
27 .row 27 .row
28 - .span3 28 + .col-md-3
29 %ul.nav.nav-pills.nav-stacked 29 %ul.nav.nav-pills.nav-stacked
30 = nav_tab :scope, nil do 30 = nav_tab :scope, nil do
31 = link_to projects_dashboard_filter_path(scope: nil) do 31 = link_to projects_dashboard_filter_path(scope: nil) do
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 %i.icon-tag 81 %i.icon-tag
82 = label.name 82 = label.name
83 83
84 - .span9 84 + .col-md-9
85 %ul.bordered-list.my-projects.top-list 85 %ul.bordered-list.my-projects.top-list
86 - @projects.each do |project| 86 - @projects.each do |project|
87 %li.my-project-row 87 %li.my-project-row
app/views/dashboard/show.html.haml
1 - if @has_authorized_projects 1 - if @has_authorized_projects
2 .dashboard 2 .dashboard
3 - .activities.span8 3 + .activities.col-md-8
4 = render 'activities' 4 = render 'activities'
5 - .side.span4 5 + .side.col-md-4
6 = render 'sidebar' 6 = render 'sidebar'
7 7
8 - else 8 - else
app/views/groups/edit.html.haml
1 .row 1 .row
2 - .span2 2 + .col-md-2
3 %ul.nav.nav-pills.nav-stacked.nav-stacked-menu 3 %ul.nav.nav-pills.nav-stacked.nav-stacked-menu
4 %li.active 4 %li.active
5 = link_to '#tab-edit', 'data-toggle' => 'tab' do 5 = link_to '#tab-edit', 'data-toggle' => 'tab' do
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 %li 12 %li
13 = link_to 'Remove', '#tab-remove', 'data-toggle' => 'tab' 13 = link_to 'Remove', '#tab-remove', 'data-toggle' => 'tab'
14 14
15 - .span10 15 + .col-md-10
16 .tab-content 16 .tab-content
17 .tab-pane.active#tab-edit 17 .tab-pane.active#tab-edit
18 .ui-box 18 .ui-box
app/views/groups/issues.html.haml
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 %hr 9 %hr
10 10
11 .row 11 .row
12 - .span3 12 + .col-md-3
13 = render 'shared/filter', entity: 'issue' 13 = render 'shared/filter', entity: 'issue'
14 - .span9 14 + .col-md-9
15 = render 'shared/issues' 15 = render 'shared/issues'
app/views/groups/merge_requests.html.haml
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 group. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page. 8 group. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
9 %hr 9 %hr
10 .row 10 .row
11 - .span3 11 + .col-md-3
12 = render 'shared/filter', entity: 'merge_request' 12 = render 'shared/filter', entity: 'merge_request'
13 - .span9 13 + .col-md-9
14 = render 'shared/merge_requests' 14 = render 'shared/merge_requests'
app/views/groups/show.html.haml
1 .dashboard 1 .dashboard
2 - .activities.span8 2 + .activities.col-md-8
3 = render "events/event_last_push", event: @last_push 3 = render "events/event_last_push", event: @last_push
4 = link_to dashboard_path, class: 'btn btn-tiny' do 4 = link_to dashboard_path, class: 'btn btn-tiny' do
5 &larr; To dashboard 5 &larr; To dashboard
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 - else 12 - else
13 %p.nothing_here_message Project activity will be displayed here 13 %p.nothing_here_message Project activity will be displayed here
14 .loading.hide 14 .loading.hide
15 - .side.span4 15 + .side.col-md-4
16 - if @group.description.present? 16 - if @group.description.present?
17 .description-block 17 .description-block
18 = @group.description 18 = @group.description
app/views/help/_api_layout.html.haml
1 .row 1 .row
2 - .span3 2 + .col-md-3
3 .append-bottom-20 3 .append-bottom-20
4 = link_to help_path, class: 'btn btn-small' do 4 = link_to help_path, class: 'btn btn-small' do
5 %i.icon-angle-left 5 %i.icon-angle-left
@@ -9,5 +9,5 @@ @@ -9,5 +9,5 @@
9 %li{class: file == @category ? 'active' : nil} 9 %li{class: file == @category ? 'active' : nil}
10 = link_to file.titleize, help_api_file_path(file) 10 = link_to file.titleize, help_api_file_path(file)
11 11
12 - .span9.pull-right 12 + .col-md-9.pull-right
13 = yield 13 = yield
app/views/help/_layout.html.haml
1 .row 1 .row
2 - .span3{:"data-spy" => 'affix'} 2 + .col-md-3{:"data-spy" => 'affix'}
3 %h3.page-title Help 3 %h3.page-title Help
4 %ul.nav.nav-pills.nav-stacked 4 %ul.nav.nav-pills.nav-stacked
5 - links = {:"Workflow" => help_workflow_path, :"SSH Keys" => help_ssh_path, :"GitLab Markdown" => help_markdown_path, :"Permissions" => help_permissions_path, :"API" => help_api_path, :"Web Hooks" => help_web_hooks_path, :"Rake Tasks" => help_raketasks_path, :"System Hooks" => help_system_hooks_path, :"Public Access" => help_public_access_path, :"Security" => help_security_path} 5 - links = {:"Workflow" => help_workflow_path, :"SSH Keys" => help_ssh_path, :"GitLab Markdown" => help_markdown_path, :"Permissions" => help_permissions_path, :"API" => help_api_path, :"Web Hooks" => help_web_hooks_path, :"Rake Tasks" => help_raketasks_path, :"System Hooks" => help_system_hooks_path, :"Public Access" => help_public_access_path, :"Security" => help_security_path}
@@ -7,5 +7,5 @@ @@ -7,5 +7,5 @@
7 %li{class: current_page?(path) ? 'active' : nil} 7 %li{class: current_page?(path) ? 'active' : nil}
8 = link_to title, path 8 = link_to title, path
9 9
10 - .span9.pull-right 10 + .col-md-9.pull-right
11 = yield 11 = yield
app/views/help/index.html.haml
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 Read more about GitLab at #{link_to "gitlab.org", "http://gitlab.org/", target: "_blank"}. 11 Read more about GitLab at #{link_to "gitlab.org", "http://gitlab.org/", target: "_blank"}.
12 12
13 .row 13 .row
14 - .span4 14 + .col-md-4
15 .ui-box 15 .ui-box
16 .title 16 .title
17 Quick help 17 Quick help
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 Browse our 35 Browse our
36 = link_to "issue tracker", "https://github.com/gitlabhq/gitlabhq/issues" 36 = link_to "issue tracker", "https://github.com/gitlabhq/gitlabhq/issues"
37 37
38 - .span4 38 + .col-md-4
39 .ui-box 39 .ui-box
40 .title 40 .title
41 User documentation 41 User documentation
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 %strong= link_to "Web Hooks", help_web_hooks_path 64 %strong= link_to "Web Hooks", help_web_hooks_path
65 %p Let GitLab notify you when new code has been pushed to your project. 65 %p Let GitLab notify you when new code has been pushed to your project.
66 66
67 - .span4 67 + .col-md-4
68 .ui-box 68 .ui-box
69 .title 69 .title
70 Admin documentation 70 Admin documentation
app/views/layouts/project_settings.html.haml
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 .container 15 .container
16 .content 16 .content
17 .row 17 .row
18 - .span2 18 + .col-md-2
19 = render "projects/settings_nav" 19 = render "projects/settings_nav"
20 - .span10 20 + .col-md-10
21 = yield 21 = yield
app/views/profiles/keys/show.html.haml
1 .row 1 .row
2 - .span4 2 + .col-md-4
3 .ui-box 3 .ui-box
4 .title 4 .title
5 SSH Key 5 SSH Key
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 %span.light Created on: 11 %span.light Created on:
12 %strong= @key.created_at.stamp("Aug 21, 2011") 12 %strong= @key.created_at.stamp("Aug 21, 2011")
13 13
14 - .span8 14 + .col-md-8
15 %p 15 %p
16 %span.light Fingerprint: 16 %span.light Fingerprint:
17 %strong= @key.fingerprint 17 %strong= @key.fingerprint
app/views/profiles/notifications/_settings.html.haml
1 %li 1 %li
2 .row 2 .row
3 - .span4 3 + .col-md-4
4 %span 4 %span
5 = notification_icon(notification) 5 = notification_icon(notification)
6 6
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 = link_to membership.group.name, membership.group 8 = link_to membership.group.name, membership.group
9 - else 9 - else
10 = link_to_project(membership.project) 10 = link_to_project(membership.project)
11 - .span7 11 + .col-md-7
12 = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do 12 = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
13 = hidden_field_tag :notification_type, type, id: dom_id(membership, 'notification_type') 13 = hidden_field_tag :notification_type, type, id: dom_id(membership, 'notification_type')
14 = hidden_field_tag :notification_id, membership.id, id: dom_id(membership, 'notification_id') 14 = hidden_field_tag :notification_id, membership.id, id: dom_id(membership, 'notification_id')
app/views/profiles/notifications/show.html.haml
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
18 &ndash; You will receive all notifications from projects in which you participate 18 &ndash; You will receive all notifications from projects in which you participate
19 19
20 .row 20 .row
21 - .span4 21 + .col-md-4
22 %h4 22 %h4
23 = notification_icon(@notification) 23 = notification_icon(@notification)
24 Global setting 24 Global setting
25 - .span7 25 + .col-md-7
26 = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do 26 = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
27 = hidden_field_tag :notification_type, 'global' 27 = hidden_field_tag :notification_type, 'global'
28 28
app/views/profiles/show.html.haml
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 - @user.errors.full_messages.each do |msg| 15 - @user.errors.full_messages.each do |msg|
16 %li= msg 16 %li= msg
17 .row 17 .row
18 - .span7 18 + .col-md-7
19 .control-group 19 .control-group
20 = f.label :name, class: "control-label" 20 = f.label :name, class: "control-label"
21 .controls 21 .controls
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250 52 = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
53 %span.help-block Tell us about yourself in fewer than 250 characters. 53 %span.help-block Tell us about yourself in fewer than 250 characters.
54 54
55 - .span5.pull-right 55 + .col-md-5.pull-right
56 .light-well 56 .light-well
57 = image_tag avatar_icon(@user.email, 160), alt: '', class: 'avatar s160' 57 = image_tag avatar_icon(@user.email, 160), alt: '', class: 'avatar s160'
58 58
app/views/projects/_home_panel.html.haml
1 - empty_repo = @project.empty_repo? 1 - empty_repo = @project.empty_repo?
2 .project-home-panel{:class => ("empty-project" if empty_repo)} 2 .project-home-panel{:class => ("empty-project" if empty_repo)}
3 .row 3 .row
4 - .span6 4 + .col-md-6
5 %h4.project-home-title 5 %h4.project-home-title
6 = @project.name_with_namespace 6 = @project.name_with_namespace
7 %span.visibility-level-label 7 %span.visibility-level-label
8 = visibility_level_icon(@project.visibility_level) 8 = visibility_level_icon(@project.visibility_level)
9 = visibility_level_label(@project.visibility_level) 9 = visibility_level_label(@project.visibility_level)
10 10
11 - .span6 11 + .col-md-6
12 - unless empty_repo 12 - unless empty_repo
13 .project-home-dropdown 13 .project-home-dropdown
14 = render "dropdown" 14 = render "dropdown"
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 = render "shared/clone_panel" 16 = render "shared/clone_panel"
17 17
18 .project-home-extra.clearfix.row 18 .project-home-extra.clearfix.row
19 - .project-home-desc.span8 19 + .project-home-desc.col-md-8
20 - if @project.description.present? 20 - if @project.description.present?
21 = @project.description 21 = @project.description
22 - if can?(current_user, :admin_project, @project) 22 - if can?(current_user, :admin_project, @project)
app/views/projects/branches/index.html.haml
1 = render "projects/commits/head" 1 = render "projects/commits/head"
2 .row 2 .row
3 - .span3 3 + .col-md-3
4 = render "filter" 4 = render "filter"
5 - .span9 5 + .col-md-9
6 - unless @branches.empty? 6 - unless @branches.empty?
7 %ul.bordered-list.top-list 7 %ul.bordered-list.top-list
8 - @branches.each do |branch| 8 - @branches.each do |branch|
9 = render "projects/branches/branch", branch: branch 9 = render "projects/branches/branch", branch: branch
10 - = paginate @branches, theme: 'gitlab'  
11 \ No newline at end of file 10 \ No newline at end of file
  11 + = paginate @branches, theme: 'gitlab'
app/views/projects/branches/recent.html.haml
1 = render "projects/commits/head" 1 = render "projects/commits/head"
2 .row 2 .row
3 - .span3 3 + .col-md-3
4 = render "filter" 4 = render "filter"
5 - .span9 5 + .col-md-9
6 %ul.bordered-list.top-list 6 %ul.bordered-list.top-list
7 - @branches.each do |branch| 7 - @branches.each do |branch|
8 - = render "projects/branches/branch", branch: branch  
9 \ No newline at end of file 8 \ No newline at end of file
  9 + = render "projects/branches/branch", branch: branch
app/views/projects/commits/_commits.html.haml
1 - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits| 1 - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
2 .row.commits-row 2 .row.commits-row
3 - .span2 3 + .col-md-2
4 %h4 4 %h4
5 %i.icon-calendar 5 %i.icon-calendar
6 %span= day.stamp("28 Aug, 2010") 6 %span= day.stamp("28 Aug, 2010")
7 %p= pluralize(commits.count, 'commit') 7 %p= pluralize(commits.count, 'commit')
8 - .span10 8 + .col-md-10
9 %ul.well-list 9 %ul.well-list
10 = render commits, project: @project 10 = render commits, project: @project
11 %hr.lists-separator 11 %hr.lists-separator
app/views/projects/deploy_keys/index.html.haml
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 %hr.clearfix 12 %hr.clearfix
13 13
14 .row 14 .row
15 - .span5.enabled-keys 15 + .col-md-5.enabled-keys
16 %h5 16 %h5
17 %strong.cgreen Enabled deploy keys 17 %strong.cgreen Enabled deploy keys
18 for this project 18 for this project
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 - if @enabled_keys.blank? 21 - if @enabled_keys.blank?
22 .light-well 22 .light-well
23 %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one 23 %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one
24 - .span5.available-keys 24 + .col-md-5.available-keys
25 %h5 25 %h5
26 %strong Deploy keys 26 %strong Deploy keys
27 from projects available to you 27 from projects available to you
app/views/projects/issues/index.html.haml
1 = render "head" 1 = render "head"
2 .row 2 .row
3 - .span3 3 + .col-md-3
4 = render 'shared/project_filter', project_entities_path: project_issues_path(@project) 4 = render 'shared/project_filter', project_entities_path: project_issues_path(@project)
5 - .span9.issues-holder 5 + .col-md-9.issues-holder
6 = render "issues" 6 = render "issues"
app/views/projects/issues/show.html.haml
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 Edit 25 Edit
26 26
27 .pull-right 27 .pull-right
28 - .span3#votes= render 'votes/votes_block', votable: @issue 28 + .col-md-3#votes= render 'votes/votes_block', votable: @issue
29 29
30 .back-link 30 .back-link
31 = link_to project_issues_path(@project) do 31 = link_to project_issues_path(@project) do
app/views/projects/merge_requests/_form.html.haml
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 .merge-request-branches 8 .merge-request-branches
9 .row 9 .row
10 - .span5 10 + .col-md-5
11 .clearfix 11 .clearfix
12 .pull-left 12 .pull-left
13 = f.select(:source_project_id, [[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, { class: 'source_project chosen span3', disabled: @merge_request.persisted? }) 13 = f.select(:source_project_id, [[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, { class: 'source_project chosen span3', disabled: @merge_request.persisted? })
@@ -15,10 +15,10 @@ @@ -15,10 +15,10 @@
15 &nbsp; 15 &nbsp;
16 = f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span2'}) 16 = f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span2'})
17 .mr_source_commit.prepend-top-10 17 .mr_source_commit.prepend-top-10
18 - .span2 18 + .col-md-2
19 %h2.merge-request-angle.light 19 %h2.merge-request-angle.light
20 %i.icon-long-arrow-right 20 %i.icon-long-arrow-right
21 - .span5 21 + .col-md-5
22 .clearfix 22 .clearfix
23 .pull-left 23 .pull-left
24 - projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project] 24 - projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
app/views/projects/merge_requests/index.html.haml
@@ -8,9 +8,9 @@ @@ -8,9 +8,9 @@
8 8
9 9
10 .row 10 .row
11 - .span3 11 + .col-md-3
12 = render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project) 12 = render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project)
13 - .span9 13 + .col-md-9
14 .ui-box 14 .ui-box
15 .title 15 .title
16 .mr-filters 16 .mr-filters
app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 Edit 35 Edit
36 36
37 .pull-right 37 .pull-right
38 - .span3#votes= render 'votes/votes_block', votable: @merge_request 38 + .col-md-3#votes= render 'votes/votes_block', votable: @merge_request
39 39
40 .back-link 40 .back-link
41 = link_to project_merge_requests_path(@project) do 41 = link_to project_merge_requests_path(@project) do
app/views/projects/milestones/_form.html.haml
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 - @milestone.errors.full_messages.each do |msg| 12 - @milestone.errors.full_messages.each do |msg|
13 %li= msg 13 %li= msg
14 .row 14 .row
15 - .span6 15 + .col-md-6
16 .control-group 16 .control-group
17 = f.label :title, "Title", class: "control-label" 17 = f.label :title, "Title", class: "control-label"
18 .controls 18 .controls
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 .controls 23 .controls
24 = f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10 24 = f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10
25 %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. 25 %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
26 - .span6 26 + .col-md-6
27 .control-group 27 .control-group
28 = f.label :due_date, "Due Date", class: "control-label" 28 = f.label :due_date, "Due Date", class: "control-label"
29 .controls= f.hidden_field :due_date 29 .controls= f.hidden_field :due_date
app/views/projects/milestones/index.html.haml
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 New Milestone 8 New Milestone
9 9
10 .row 10 .row
11 - .span3 11 + .col-md-3
12 %ul.nav.nav-pills.nav-stacked 12 %ul.nav.nav-pills.nav-stacked
13 %li{class: ("active" if (params[:f] == "active" || !params[:f]))} 13 %li{class: ("active" if (params[:f] == "active" || !params[:f]))}
14 = link_to project_milestones_path(@project, f: "active") do 14 = link_to project_milestones_path(@project, f: "active") do
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 %li{class: ("active" if params[:f] == "all")} 19 %li{class: ("active" if params[:f] == "all")}
20 = link_to project_milestones_path(@project, f: "all") do 20 = link_to project_milestones_path(@project, f: "all") do
21 All 21 All
22 - .span9 22 + .col-md-9
23 .ui-box 23 .ui-box
24 %ul.well-list 24 %ul.well-list
25 = render @milestones 25 = render @milestones
app/views/projects/milestones/show.html.haml
@@ -72,22 +72,22 @@ @@ -72,22 +72,22 @@
72 .tab-content 72 .tab-content
73 .tab-pane.active#tab-issues 73 .tab-pane.active#tab-issues
74 .row 74 .row
75 - .span4 75 + .col-md-4
76 = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned) 76 = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned)
77 - .span4 77 + .col-md-4
78 = render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned) 78 = render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned)
79 - .span4 79 + .col-md-4
80 = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed) 80 = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed)
81 81
82 .tab-pane#tab-merge-requests 82 .tab-pane#tab-merge-requests
83 .row 83 .row
84 - .span6 84 + .col-md-6
85 .ui-box 85 .ui-box
86 .title Open 86 .title Open
87 %ul.well-list 87 %ul.well-list
88 - @merge_requests.opened.each do |merge_request| 88 - @merge_requests.opened.each do |merge_request|
89 = render 'merge_request', merge_request: merge_request 89 = render 'merge_request', merge_request: merge_request
90 - .span6 90 + .col-md-6
91 .ui-box 91 .ui-box
92 .title Closed 92 .title Closed
93 %ul.well-list 93 %ul.well-list
app/views/projects/protected_branches/index.html.haml
1 = render "projects/commits/head" 1 = render "projects/commits/head"
2 .row 2 .row
3 - .span3 3 + .col-md-3
4 = render "projects/branches/filter" 4 = render "projects/branches/filter"
5 - .span9 5 + .col-md-9
6 .alert.alert-info 6 .alert.alert-info
7 %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}. 7 %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
8 %p This ability allows: 8 %p This ability allows:
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 21
22 .entry.clearfix 22 .entry.clearfix
23 = f.label :name, "Branch" 23 = f.label :name, "Branch"
24 - .span3 24 + .col-md-3
25 = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "chosen span3"}) 25 = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "chosen span3"})
26 &nbsp; 26 &nbsp;
27 = f.submit 'Protect', class: "btn-create btn" 27 = f.submit 'Protect', class: "btn-create btn"
app/views/projects/repositories/stats.html.haml
1 = render "projects/commits/head" 1 = render "projects/commits/head"
2 .row 2 .row
3 - .span6 3 + .col-md-6
4 %div#activity-chart.chart 4 %div#activity-chart.chart
5 %hr 5 %hr
6 %p 6 %p
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 %span= @stats.authors_count 14 %span= @stats.authors_count
15 15
16 16
17 - .span6 17 + .col-md-6
18 %h4 Top 50 Committers: 18 %h4 Top 50 Committers:
19 %ol.styled 19 %ol.styled
20 - @stats.authors[0...50].each do |author| 20 - @stats.authors[0...50].each do |author|
app/views/projects/show.html.haml
1 = render "home_panel" 1 = render "home_panel"
2 2
3 .row 3 .row
4 - .span9 4 + .col-md-9
5 = render "events/event_last_push", event: @last_push 5 = render "events/event_last_push", event: @last_push
6 = render 'shared/event_filter' 6 = render 'shared/event_filter'
7 .content_list 7 .content_list
8 .loading.hide 8 .loading.hide
9 - .span3.project-side 9 + .col-md-3.project-side
10 .clearfix 10 .clearfix
11 - if @project.archived? 11 - if @project.archived?
12 .alert 12 .alert
app/views/snippets/current_user_index.html.haml
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 %hr 11 %hr
12 12
13 .row 13 .row
14 - .span3 14 + .col-md-3
15 %ul.nav.nav-pills.nav-stacked 15 %ul.nav.nav-pills.nav-stacked
16 = nav_tab :scope, nil do 16 = nav_tab :scope, nil do
17 = link_to user_snippets_path(@user) do 17 = link_to user_snippets_path(@user) do
@@ -29,6 +29,6 @@ @@ -29,6 +29,6 @@
29 %span.pull-right 29 %span.pull-right
30 = @user.snippets.public.count 30 = @user.snippets.public.count
31 31
32 - .span9.my-snippets 32 + .col-md-9.my-snippets
33 = render 'snippets' 33 = render 'snippets'
34 34
app/views/users/show.html.haml
1 .row 1 .row
2 - .span8 2 + .col-md-8
3 %h3.page-title 3 %h3.page-title
4 = image_tag avatar_icon(@user.email, 90), class: "avatar s90", alt: '' 4 = image_tag avatar_icon(@user.email, 90), class: "avatar s90", alt: ''
5 = @user.name 5 = @user.name
@@ -16,6 +16,6 @@ @@ -16,6 +16,6 @@
16 %hr 16 %hr
17 %h4 User Activity: 17 %h4 User Activity:
18 = render @events 18 = render @events
19 - .span4 19 + .col-md-4
20 = render 'profile', user: @user 20 = render 'profile', user: @user
21 = render 'projects', user: @user 21 = render 'projects', user: @user