Commit 0676f1da authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #7934 from Soullivaneuh/font-awesome

Upgrade to Font Awesome v4.2
parents ac6f0321 5d8be443
...@@ -14,6 +14,7 @@ v 7.4.0 ...@@ -14,6 +14,7 @@ v 7.4.0
- Fail harder in the backup script - Fail harder in the backup script
- Zen mode for wiki and milestones (Robert Schilling) - Zen mode for wiki and milestones (Robert Schilling)
- Move Emoji parsing to html-pipeline-gitlab (Robert Schilling) - Move Emoji parsing to html-pipeline-gitlab (Robert Schilling)
- Font Awesome 4.2 integration (Sullivan Senechal)
v 7.3.2 v 7.3.2
- Fix creating new file via web editor - Fix creating new file via web editor
......
...@@ -180,7 +180,7 @@ gem "jquery-ui-rails" ...@@ -180,7 +180,7 @@ gem "jquery-ui-rails"
gem "jquery-scrollto-rails" gem "jquery-scrollto-rails"
gem "raphael-rails", "~> 2.1.2" gem "raphael-rails", "~> 2.1.2"
gem 'bootstrap-sass', '~> 3.0' gem 'bootstrap-sass', '~> 3.0'
gem "font-awesome-rails", '~> 3.2' gem "font-awesome-rails", '~> 4.2'
gem "gitlab_emoji", "~> 0.0.1.1" gem "gitlab_emoji", "~> 0.0.1.1"
gem "gon", '~> 5.0.0' gem "gon", '~> 5.0.0'
gem 'nprogress-rails' gem 'nprogress-rails'
......
...@@ -152,7 +152,7 @@ GEM ...@@ -152,7 +152,7 @@ GEM
net-ssh (>= 2.1.3) net-ssh (>= 2.1.3)
fog-json (1.0.0) fog-json (1.0.0)
multi_json (~> 1.0) multi_json (~> 1.0)
font-awesome-rails (3.2.1.3) font-awesome-rails (4.2.0.0)
railties (>= 3.2, < 5.0) railties (>= 3.2, < 5.0)
foreman (0.63.0) foreman (0.63.0)
dotenv (>= 0.7) dotenv (>= 0.7)
...@@ -614,7 +614,7 @@ DEPENDENCIES ...@@ -614,7 +614,7 @@ DEPENDENCIES
factory_girl_rails factory_girl_rails
ffaker ffaker
fog (~> 1.14) fog (~> 1.14)
font-awesome-rails (~> 3.2) font-awesome-rails (~> 4.2)
foreman foreman
gemnasium-gitlab-service (~> 0.2) gemnasium-gitlab-service (~> 0.2)
github-markup github-markup
......
...@@ -172,8 +172,8 @@ $ -> ...@@ -172,8 +172,8 @@ $ ->
# Show/hide comments on diff # Show/hide comments on diff
$("body").on "click", ".js-toggle-diff-comments", (e) -> $("body").on "click", ".js-toggle-diff-comments", (e) ->
$(@).find('i'). $(@).find('i').
toggleClass('icon-chevron-down'). toggleClass('fa fa-chevron-down').
toggleClass('icon-chevron-up') toggleClass('fa fa-chevron-up')
$(@).closest(".diff-file").find(".notes_holder").toggle() $(@).closest(".diff-file").find(".notes_holder").toggle()
e.preventDefault() e.preventDefault()
......
...@@ -8,7 +8,7 @@ $ -> ...@@ -8,7 +8,7 @@ $ ->
# #
$("body").on "click", ".js-toggle-button", (e) -> $("body").on "click", ".js-toggle-button", (e) ->
$(@).find('i'). $(@).find('i').
toggleClass('icon-chevron-down'). toggleClass('fa fa-chevron-down').
toggleClass('icon-chevron-up') toggleClass('fa fa-chevron-up')
$(@).closest(".js-toggle-container").find(".js-toggle-content").toggle() $(@).closest(".js-toggle-container").find(".js-toggle-content").toggle()
e.preventDefault() e.preventDefault()
...@@ -7,8 +7,8 @@ $(document).ready -> ...@@ -7,8 +7,8 @@ $(document).ready ->
divHover = "<div class=\"div-dropzone-hover\"></div>" divHover = "<div class=\"div-dropzone-hover\"></div>"
divSpinner = "<div class=\"div-dropzone-spinner\"></div>" divSpinner = "<div class=\"div-dropzone-spinner\"></div>"
divAlert = "<div class=\"" + alertClass + "\"></div>" divAlert = "<div class=\"" + alertClass + "\"></div>"
iconPicture = "<i class=\"icon-picture div-dropzone-icon\"></i>" iconPicture = "<i class=\"fa fa-picture-o div-dropzone-icon\"></i>"
iconSpinner = "<i class=\"icon-spinner icon-spin div-dropzone-icon\"></i>" iconSpinner = "<i class=\"fa fa-spinner fa-spin div-dropzone-icon\"></i>"
btnAlert = "<button type=\"button\"" + alertAttr + ">&times;</button>" btnAlert = "<button type=\"button\"" + alertAttr + ">&times;</button>"
project_image_path_upload = window.project_image_path_upload or null project_image_path_upload = window.project_image_path_upload or null
......
...@@ -124,7 +124,7 @@ $list-group-active-bg: $bg_primary; ...@@ -124,7 +124,7 @@ $list-group-active-bg: $bg_primary;
color: #888; color: #888;
text-shadow: 0 1px 1px #fff; text-shadow: 0 1px 1px #fff;
} }
i[class^="icon-"] { i[class~="fa"] {
line-height: 14px; line-height: 14px;
} }
} }
......
...@@ -119,8 +119,7 @@ ul.notes { ...@@ -119,8 +119,7 @@ ul.notes {
display: none; display: none;
float: right; float: right;
[class^="icon-"], [class~="fa"] {
[class*="icon-"] {
font-size: 16px; font-size: 16px;
line-height: 16px; line-height: 16px;
vertical-align: middle; vertical-align: middle;
......
...@@ -229,7 +229,7 @@ module ApplicationHelper ...@@ -229,7 +229,7 @@ module ApplicationHelper
css_class << " hide" unless visible css_class << " hide" unless visible
content_tag :div, class: css_class do content_tag :div, class: css_class do
content_tag(:i, nil, class: 'icon-spinner icon-spin') + text content_tag(:i, nil, class: 'fa fa-spinner fa-spin') + text
end end
end end
......
...@@ -36,10 +36,10 @@ module EventsHelper ...@@ -36,10 +36,10 @@ module EventsHelper
def icon_for_event def icon_for_event
{ {
EventFilter.push => "icon-upload-alt", EventFilter.push => 'fa fa-upload',
EventFilter.merged => "icon-check", EventFilter.merged => 'fa fa-check-square-o',
EventFilter.comments => "icon-comments", EventFilter.comments => 'fa fa-comments',
EventFilter.team => "icon-user", EventFilter.team => 'fa fa-user',
} }
end end
......
module IconsHelper module IconsHelper
def boolean_to_icon(value) def boolean_to_icon(value)
if value.to_s == "true" if value.to_s == "true"
content_tag :i, nil, class: 'icon-circle cgreen' content_tag :i, nil, class: 'fa fa-circle cgreen'
else else
content_tag :i, nil, class: 'icon-off clgray' content_tag :i, nil, class: 'fa fa-power-off clgray'
end end
end end
def public_icon def public_icon
content_tag :i, nil, class: 'icon-globe' content_tag :i, nil, class: 'fa fa-globe'
end end
def internal_icon def internal_icon
content_tag :i, nil, class: 'icon-shield' content_tag :i, nil, class: 'fa fa-shield'
end end
def private_icon def private_icon
content_tag :i, nil, class: 'icon-lock' content_tag :i, nil, class: 'fa fa-lock'
end end
end end
...@@ -69,7 +69,7 @@ module NotesHelper ...@@ -69,7 +69,7 @@ module NotesHelper
button_tag class: 'btn reply-btn js-discussion-reply-button', button_tag class: 'btn reply-btn js-discussion-reply-button',
data: data, title: 'Add a reply' do data: data, title: 'Add a reply' do
link_text = content_tag(:i, nil, class: 'icon-comment') link_text = content_tag(:i, nil, class: 'fa fa-comment')
link_text << ' Reply' link_text << ' Reply'
end end
end end
......
module NotificationsHelper module NotificationsHelper
def notification_icon(notification) def notification_icon(notification)
if notification.disabled? if notification.disabled?
content_tag :i, nil, class: 'icon-volume-off ns-mute' content_tag :i, nil, class: 'fa fa-volume-off ns-mute'
elsif notification.participating? elsif notification.participating?
content_tag :i, nil, class: 'icon-volume-down ns-part' content_tag :i, nil, class: 'fa fa-volume-down ns-part'
elsif notification.watch? elsif notification.watch?
content_tag :i, nil, class: 'icon-volume-up ns-watch' content_tag :i, nil, class: 'fa fa-volume-up ns-watch'
else else
content_tag :i, nil, class: 'icon-circle-blank ns-default' content_tag :i, nil, class: 'fa fa-circle-o ns-default'
end end
end end
end end
...@@ -133,7 +133,7 @@ module ProjectsHelper ...@@ -133,7 +133,7 @@ module ProjectsHelper
'Star' 'Star'
end end
content_tag('i', ' ', class: 'icon-star') + toggle_text content_tag('i', ' ', class: 'fa fa-star') + toggle_text
end end
count_html = content_tag('span', class: 'count') do count_html = content_tag('span', class: 'count') do
...@@ -157,7 +157,7 @@ module ProjectsHelper ...@@ -157,7 +157,7 @@ module ProjectsHelper
end end
def link_to_toggle_fork def link_to_toggle_fork
out = content_tag(:i, '', class: 'icon-code-fork') out = content_tag(:i, '', class: 'fa fa-code-fork')
out << ' Fork' out << ' Fork'
out << content_tag(:span, class: 'count') do out << content_tag(:span, class: 'count') do
@project.forks_count.to_s @project.forks_count.to_s
......
...@@ -36,9 +36,9 @@ module TreeHelper ...@@ -36,9 +36,9 @@ module TreeHelper
# type - String type of the tree item; either 'folder' or 'file' # type - String type of the tree item; either 'folder' or 'file'
def tree_icon(type) def tree_icon(type)
icon_class = if type == 'folder' icon_class = if type == 'folder'
'icon-folder-close' 'fa fa-folder'
else else
'icon-file-alt' 'fa fa-file-o'
end end
content_tag :i, nil, class: icon_class content_tag :i, nil, class: icon_class
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.panel-body .panel-body
- if @sidekiq_processes.empty? - if @sidekiq_processes.empty?
%h4.cred %h4.cred
%i.icon-warning-sign %i.fa.fa-exclamation-triangle
There are no running sidekiq processes. Please restart GitLab There are no running sidekiq processes. Please restart GitLab
- else - else
%table.table %table.table
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
.clearfix .clearfix
%p %p
%i.icon-exclamation-sign %i.fa.fa-exclamation-circle
If '[25 of 25 busy]' is shown, restart GitLab with 'sudo service gitlab reload'. If '[25 of 25 busy]' is shown, restart GitLab with 'sudo service gitlab reload'.
%p %p
%i.icon-exclamation-sign %i.fa.fa-exclamation-circle
If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u #{Settings.gitlab.user} -f sidekiq) and restart GitLab. If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u #{Settings.gitlab.user} -f sidekiq) and restart GitLab.
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%p.light %p.light
Broadcast messages are displayed for every user and can be used to notify users about scheduled maintenance, recent upgrades and more. Broadcast messages are displayed for every user and can be used to notify users about scheduled maintenance, recent upgrades and more.
.broadcast-message-preview .broadcast-message-preview
%i.icon-bullhorn %i.fa.fa-bullhorn
%span Your message here %span Your message here
= form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form form-horizontal'} do |f| = form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form form-horizontal'} do |f|
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#{broadcast_message.ends_at.to_s(:short)} #{broadcast_message.ends_at.to_s(:short)}
&nbsp; &nbsp;
= link_to [:admin, broadcast_message], method: :delete, remote: true, class: 'remove-row btn btn-tiny' do = link_to [:admin, broadcast_message], method: :delete, remote: true, class: 'remove-row btn btn-tiny' do
%i.icon-remove.cred %i.fa.fa-times.cred
.message= broadcast_message.message .message= broadcast_message.message
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
= f.label :avatar, "Group avatar", class: 'control-label' = f.label :avatar, "Group avatar", class: 'control-label'
.col-sm-10 .col-sm-10
%a.choose-btn.btn.btn-small.js-choose-group-avatar-button %a.choose-btn.btn.btn-small.js-choose-group-avatar-button
%i.icon-paper-clip %i.fa.fa-paperclip
%span Choose File ... %span Choose File ...
&nbsp; &nbsp;
%span.file_name.js-avatar-filename File name... %span.file_name.js-avatar-filename File name...
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
%h4 %h4
= link_to [:admin, group] do = link_to [:admin, group] do
%i.icon-folder-close %i.fa.fa-folder
= group.name = group.name
&rarr; &rarr;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Group: #{@group.name} Group: #{@group.name}
= link_to edit_admin_group_path(@group), class: "btn pull-right" do = link_to edit_admin_group_path(@group), class: "btn pull-right" do
%i.icon-edit %i.fa.fa-pencil-square-o
Edit Edit
%hr %hr
.row .row
...@@ -81,6 +81,6 @@ ...@@ -81,6 +81,6 @@
%span.pull-right.light %span.pull-right.light
= member.human_access = member.human_access
= link_to group_group_members_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do = link_to group_group_members_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
%i.icon-minus.icon-white %i.fa.fa-minus.fa-inverse
.panel-footer .panel-footer
= paginate @members, param_name: 'members_page', theme: 'gitlab' = paginate @members, param_name: 'members_page', theme: 'gitlab'
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
.tab-pane.active#githost .tab-pane.active#githost
.file-holder#README .file-holder#README
.file-title .file-title
%i.icon-file %i.fa.fa-file
githost.log githost.log
.pull-right .pull-right
= link_to '#', class: 'log-bottom' do = link_to '#', class: 'log-bottom' do
%i.icon-arrow-down %i.fa.fa-arrow-down
Scroll down Scroll down
.file-content.logs .file-content.logs
%ol %ol
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
.tab-pane#application .tab-pane#application
.file-holder#README .file-holder#README
.file-title .file-title
%i.icon-file %i.fa.fa-file
application.log application.log
.pull-right .pull-right
= link_to '#', class: 'log-bottom' do = link_to '#', class: 'log-bottom' do
%i.icon-arrow-down %i.fa.fa-arrow-down
Scroll down Scroll down
.file-content.logs .file-content.logs
%ol %ol
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
.tab-pane#production .tab-pane#production
.file-holder#README .file-holder#README
.file-title .file-title
%i.icon-file %i.fa.fa-file
production.log production.log
.pull-right .pull-right
= link_to '#', class: 'log-bottom' do = link_to '#', class: 'log-bottom' do
%i.icon-arrow-down %i.fa.fa-arrow-down
Scroll down Scroll down
.file-content.logs .file-content.logs
%ol %ol
...@@ -55,11 +55,11 @@ ...@@ -55,11 +55,11 @@
.tab-pane#sidekiq .tab-pane#sidekiq
.file-holder#README .file-holder#README
.file-title .file-title
%i.icon-file %i.fa.fa-file
sidekiq.log sidekiq.log
.pull-right .pull-right
= link_to '#', class: 'log-bottom' do = link_to '#', class: 'log-bottom' do
%i.icon-arrow-down %i.fa.fa-arrow-down
Scroll down Scroll down
.file-content.logs .file-content.logs
%ol %ol
......
%h3.page-title %h3.page-title
Project: #{@project.name_with_namespace} Project: #{@project.name_with_namespace}
= link_to edit_project_path(@project), class: "btn pull-right" do = link_to edit_project_path(@project), class: "btn pull-right" do
%i.icon-edit %i.fa.fa-pencil-square-o
Edit Edit
%hr %hr
.row .row
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
group members (#{@group.group_members.count}) group members (#{@group.group_members.count})
.pull-right .pull-right
= link_to admin_group_path(@group), class: 'btn btn-small' do = link_to admin_group_path(@group), class: 'btn btn-small' do
%i.icon-edit %i.fa.fa-pencil-square-o
%ul.well-list %ul.well-list
- @group_members.each do |member| - @group_members.each do |member|
= render 'groups/group_members/group_member', member: member, show_controls: false = render 'groups/group_members/group_member', member: member, show_controls: false
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
(#{@project.users.count}) (#{@project.users.count})
.pull-right .pull-right
= link_to project_team_index_path(@project), class: "btn btn-tiny" do = link_to project_team_index_path(@project), class: "btn btn-tiny" do
%i.icon-edit %i.fa.fa-pencil-square-o
Manage Access Manage Access
%ul.well-list.team_members %ul.well-list.team_members
- @project_members.each do |project_member| - @project_members.each do |project_member|
...@@ -127,6 +127,6 @@ ...@@ -127,6 +127,6 @@
- else - else
%span.light= project_member.human_access %span.light= project_member.human_access
= link_to project_team_member_path(@project, user), data: { confirm: remove_from_project_team_message(@project, user)}, method: :delete, remote: true, class: "btn btn-small btn-remove" do = link_to project_team_member_path(@project, user), data: { confirm: remove_from_project_team_message(@project, user)}, method: :delete, remote: true, class: "btn btn-small btn-remove" do
%i.icon-remove %i.fa.fa-times
.panel-footer .panel-footer
= paginate @project_members, param_name: 'project_members_page', theme: 'gitlab' = paginate @project_members, param_name: 'project_members_page', theme: 'gitlab'
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
.form-group .form-group
= search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control' = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control'
= button_tag class: 'btn btn-primary' do = button_tag class: 'btn btn-primary' do
%i.icon-search %i.fa.fa-search
%hr %hr
= link_to 'Reset', admin_users_path, class: "btn btn-cancel" = link_to 'Reset', admin_users_path, class: "btn btn-cancel"
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
%li %li
.list-item-name .list-item-name
- if user.blocked? - if user.blocked?
%i.icon-lock.cred %i.fa.fa-lock.cred
- else - else
%i.icon-user.cgreen %i.fa.fa-user.cgreen
= link_to user.name, [:admin, user] = link_to user.name, [:admin, user]
- if user.admin? - if user.admin?
%strong.cred (Admin) %strong.cred (Admin)
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
%span.cred It's you! %span.cred It's you!
.pull-right .pull-right
%span.light %span.light
%i.icon-envelope %i.fa.fa-envelope
= mail_to user.email, user.email, class: 'light' = mail_to user.email, user.email, class: 'light'
&nbsp; &nbsp;
= link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: "btn btn-small" = link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: "btn btn-small"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.pull-right .pull-right
= link_to edit_admin_user_path(@user), class: "btn btn-grouped" do = link_to edit_admin_user_path(@user), class: "btn btn-grouped" do
%i.icon-edit %i.fa.fa-pencil-square-o
Edit Edit
%hr %hr
%ul.nav.nav-tabs %ul.nav.nav-tabs
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
%span.light Secondary email: %span.light Secondary email:
%strong= email.email %strong= email.email
= link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn-tiny btn btn-remove pull-right", title: 'Remove secondary email', id: "remove_email_#{email.id}" do = link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn-tiny btn btn-remove pull-right", title: 'Remove secondary email', id: "remove_email_#{email.id}" do
%i.icon-remove %i.fa.fa-times
%li %li
%span.light Can create groups: %span.light Can create groups:
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
%span.light= user_group.human_access %span.light= user_group.human_access
- unless user_group.owner? - unless user_group.owner?
= link_to group_group_member_path(group, user_group), data: { confirm: remove_user_from_group_message(group, @user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do = link_to group_group_member_path(group, user_group), data: { confirm: remove_user_from_group_message(group, @user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
%i.icon-remove.icon-white %i.fa.fa-times.fa-inverse
- else - else
.nothing-here-block This user has no groups. .nothing-here-block This user has no groups.
...@@ -216,4 +216,4 @@ ...@@ -216,4 +216,4 @@
- if tm.respond_to? :project - if tm.respond_to? :project
= link_to project_team_member_path(project, @user), data: { confirm: remove_from_project_team_message(project, @user) }, remote: true, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from project' do = link_to project_team_member_path(project, @user), data: { confirm: remove_from_project_team_message(project, @user) }, remote: true, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from project' do
%i.icon-remove %i.fa.fa-times
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
- if current_user.can_create_group? - if current_user.can_create_group?
= link_to new_group_path, class: "btn btn-new pull-right" do = link_to new_group_path, class: "btn btn-new pull-right" do
%i.icon-plus %i.fa.fa-plus
New group New group
%ul.well-list.dash-list %ul.well-list.dash-list
- groups.each do |group| - groups.each do |group|
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
%span.group-name.filter-title %span.group-name.filter-title
= truncate(group.name, length: 35) = truncate(group.name, length: 35)
%span.arrow %span.arrow
%i.icon-angle-right %i.fa.fa-angle-right
- if groups.blank? - if groups.blank?
%li %li
.nothing-here-block You have no groups yet. .nothing-here-block You have no groups yet.
...@@ -9,4 +9,4 @@ ...@@ -9,4 +9,4 @@
%span.project-name.filter-title %span.project-name.filter-title
= project.name = project.name
%span.arrow %span.arrow
%i.icon-angle-right %i.fa.fa-angle-right
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
- if current_user.can_create_project? - if current_user.can_create_project?
= link_to new_project_path, class: "btn btn-new pull-right" do = link_to new_project_path, class: "btn btn-new pull-right" do
%i.icon-plus %i.fa.fa-plus
New project New project
%ul.well-list.dash-list %ul.well-list.dash-list
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
.pull-right .pull-right
= link_to projects_dashboard_path do = link_to projects_dashboard_path do
Show all Show all
%i.icon-angle-right %i.fa.fa-angle-right
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
- @groups.each do |group| - @groups.each do |group|
%li{ class: (group.name == params[:group]) ? 'active' : 'light' } %li{ class: (group.name == params[:group]) ? 'active' : 'light' }
= link_to projects_dashboard_filter_path(group: group.name) do = link_to projects_dashboard_filter_path(group: group.name) do
%i.icon-folder-close-alt %i.fa.fa-folder-o
= group.name = group.name
%small.pull-right %small.pull-right
= group.projects.count = group.projects.count
...@@ -51,5 +51,5 @@ ...@@ -51,5 +51,5 @@
- @tags.each do |tag| - @tags.each do |tag|
%li{ class: (tag.name == params[:tag]) ? 'active' : 'light' } %li{ class: (tag.name == params[:tag]) ? 'active' : 'light' }
= link_to projects_dashboard_filter_path(scope: params[:scope], tag: tag.name) do = link_to projects_dashboard_filter_path(scope: params[:scope], tag: tag.name) do
%i.icon-tag %i.fa.fa-tag
= tag.name = tag.name
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
%span.rss-icon %span.rss-icon
= link_to dashboard_path(:atom, { private_token: current_user.private_token }) do = link_to dashboard_path(:atom, { private_token: current_user.private_token }) do
%strong %strong
%i.icon-rss %i.fa.fa-rss
News Feed News Feed
%hr %hr
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%hr %hr
%div %div
.dashboard-intro-icon .dashboard-intro-icon
%i.icon-bookmark-empty %i.fa.fa-bookmark-o
%div %div
%p.slead %p.slead
You don't have access to any projects right now. You don't have access to any projects right now.
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%hr %hr
%div %div
.dashboard-intro-icon .dashboard-intro-icon
%i.icon-group %i.fa.fa-users
%div %div
%p.slead %p.slead
You can create a group for several dependent projects. You can create a group for several dependent projects.
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
%hr %hr
%div %div
.dashboard-intro-icon .dashboard-intro-icon
%i.icon-globe %i.fa.fa-globe
%div %div
%p.slead %p.slead
There are There are
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.row .row
.fixed.sidebar-expand-button.hidden-lg.hidden-md .fixed.sidebar-expand-button.hidden-lg.hidden-md
%i.icon-list.icon-2x %i.fa.fa-list.fa-2x
.col-md-3.responsive-side .col-md-3.responsive-side
= render 'shared/filter', entity: 'issue' = render 'shared/filter', entity: 'issue'
.col-md-9 .col-md-9
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
%hr %hr
.row .row
.fixed.sidebar-expand-button.hidden-lg.hidden-md .fixed.sidebar-expand-button.hidden-lg.hidden-md
%i.icon-list.icon-2x %i.fa.fa-list.fa-2x
.col-md-3.responsive-side .col-md-3.responsive-side
= render 'shared/filter', entity: 'merge_request' = render 'shared/filter', entity: 'merge_request'
.col-md-9 .col-md-9
......
...@@ -40,23 +40,23 @@ ...@@ -40,23 +40,23 @@
- if current_user.can_leave_project?(project) - if current_user.can_leave_project?(project)
.pull-right .pull-right
= link_to leave_project_team_members_path(project), data: { confirm: "Leave project?"}, method: :delete, remote: true, class: "btn-tiny btn remove-row", title: 'Leave project' do = link_to leave_project_team_members_path(project), data: { confirm: "Leave project?"}, method: :delete, remote: true, class: "btn-tiny btn remove-row", title: 'Leave project' do
%i.icon-signout %i.fa.fa-sign-out
Leave Leave
- if project.forked_from_project - if project.forked_from_project
%small.pull-right %small.pull-right
%i.icon-code-fork %i.fa.fa-code-fork
Forked from: Forked from:
= link_to project.forked_from_project.name_with_namespace, project_path(project.forked_from_project) = link_to project.forked_from_project.name_with_namespace, project_path(project.forked_from_project)
.project-info .project-info
.pull-right .pull-right
- if project.archived? - if project.archived?
%span.label %span.label
%i.icon-archive %i.fa.fa-archive
Archived Archived
- project.tags.each do |tag| - project.tags.each do |tag|
%span.label.label-info %span.label.label-info
%i.icon-tag %i.fa.fa-tag
= tag.name = tag.name
- if project.description.present? - if project.description.present?
%p= truncate project.description, length: 100 %p= truncate project.description, length: 100
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= render 'sidebar' = render 'sidebar'
.fixed.sidebar-expand-button.hidden-lg.hidden-md .fixed.sidebar-expand-button.hidden-lg.hidden-md
%i.icon-list.icon-2x %i.fa.fa-list.fa-2x
- else - else
= render "zero_authorized_projects" = render "zero_authorized_projects"
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
.event-body .event-body
.event-note .event-note
.md .md
%i.icon-comment-alt.event-note-icon %i.fa.fa-comment-o.event-note-icon
= event_note(event.target.note) = event_note(event.target.note)
- note = event.target - note = event.target
- if note.attachment.url - if note.attachment.url
...@@ -18,5 +18,5 @@ ...@@ -18,5 +18,5 @@
= image_tag note.attachment.secure_url, class: 'note-image-attach' = image_tag note.attachment.secure_url, class: 'note-image-attach'
- else - else
= link_to note.attachment.secure_url, target: "_blank", class: 'note-file-attach' do = link_to note.attachment.secure_url, target: "_blank", class: 'note-file-attach' do
%i.icon-paper-clip %i.fa.fa-paperclip
= note.attachment_identifier = note.attachment_identifier
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
.clearfix .clearfix
%h4 %h4
= link_to group_path(id: group.path) do = link_to group_path(id: group.path) do
%i.icon-group %i.fa.fa-users
= group.name = group.name
.clearfix .clearfix
%p %p
......
...@@ -21,5 +21,5 @@ ...@@ -21,5 +21,5 @@
&middot; &middot;
= link_to pluralize(project.repository.tag_names.count, 'tag'), project_tags_path(project) = link_to pluralize(project.repository.tag_names.count, 'tag'), project_tags_path(project)
- else - else
%i.icon-warning-sign %i.fa.fa-exclamation-triangle
Empty repository Empty repository
.explore-trending-block .explore-trending-block
%p.lead %p.lead
%i.icon-comments-alt %i.fa.fa-comments-o
See most starred projects See most starred projects
%hr %hr
.public-projects .public-projects
......
.explore-trending-block .explore-trending-block
%p.lead %p.lead
%i.icon-comments-alt %i.fa.fa-comments-o
See most discussed projects for last month See most discussed projects for last month
%hr %hr
.public-projects .public-projects
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- if can? current_user, :create_projects, @group - if can? current_user, :create_projects, @group
.panel-head-actions .panel-head-actions
= link_to new_project_path(namespace_id: @group.id), class: "btn btn-new" do = link_to new_project_path(namespace_id: @group.id), class: "btn btn-new" do
%i.icon-plus %i.fa.fa-plus
New project New project
%ul.well-list %ul.well-list
- if projects.blank? - if projects.blank?
...@@ -18,4 +18,4 @@ ...@@ -18,4 +18,4 @@
%span.project-name %span.project-name
= project.name = project.name
%span.arrow %span.arrow
%i.icon-angle-right %i.fa.fa-angle-right
%ul.nav.nav-pills.nav-stacked.nav-stacked-menu %ul.nav.nav-pills.nav-stacked.nav-stacked-menu
= nav_link(path: 'groups#edit') do = nav_link(path: 'groups#edit') do
= link_to edit_group_path(@group) do = link_to edit_group_path(@group) do
%i.icon-edit %i.fa.fa-pencil-square-o
Group Group
= nav_link(path: 'groups#projects') do = nav_link(path: 'groups#projects') do
= link_to projects_group_path(@group) do = link_to projects_group_path(@group) do
%i.icon-folder-close %i.fa.fa-folder
Projects Projects
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
- else - else
You can upload a group avatar here You can upload a group avatar here
%a.choose-btn.btn.btn-small.js-choose-group-avatar-button %a.choose-btn.btn.btn-small.js-choose-group-avatar-button
%i.icon-paper-clip %i.fa.fa-paperclip
%span Choose File ... %span Choose File ...
&nbsp; &nbsp;
%span.file_name.js-avatar-filename File name... %span.file_name.js-avatar-filename File name...
......
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
- if show_controls - if show_controls
- if can?(current_user, :modify, member) - if can?(current_user, :modify, member)
= link_to '#', class: "btn-tiny btn js-toggle-button", title: 'Edit access level' do = link_to '#', class: "btn-tiny btn js-toggle-button", title: 'Edit access level' do
%i.icon-edit %i.fa.fa-pencil-square-o
- if can?(current_user, :destroy, member) - if can?(current_user, :destroy, member)
- if current_user == member.user - if current_user == member.user
= link_to leave_profile_group_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do = link_to leave_profile_group_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
%i.icon-minus.icon-white %i.fa.fa-minus.fa-inverse
- else - else
= link_to group_group_member_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do = link_to group_group_member_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
%i.icon-minus.icon-white %i.fa.fa-minus.fa-inverse
.edit-member.hide.js-toggle-content .edit-member.hide.js-toggle-content
= form_for [@group, member], remote: true do |f| = form_for [@group, member], remote: true do |f|
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.row .row
.fixed.sidebar-expand-button.hidden-lg.hidden-md .fixed.sidebar-expand-button.hidden-lg.hidden-md
%i.icon-list.icon-2x %i.fa.fa-list.fa-2x
.col-md-3.responsive-side .col-md-3.responsive-side
= render 'shared/filter', entity: 'issue' = render 'shared/filter', entity: 'issue'
.col-md-9 .col-md-9
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
.pull-right .pull-right
= link_to '#', class: 'btn btn-new js-toggle-button' do = link_to '#', class: 'btn btn-new js-toggle-button' do
Add members Add members
%i.icon-chevron-down %i.fa.fa-chevron-down
.js-toggle-content.hide.new-group-member-holder .js-toggle-content.hide.new-group-member-holder
= render "new_group_member" = render "new_group_member"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
%hr %hr
.row .row
.fixed.sidebar-expand-button.hidden-lg.hidden-md .fixed.sidebar-expand-button.hidden-lg.hidden-md
%i.icon-list.icon-2x %i.fa.fa-list.fa-2x
.col-md-3.responsive-side .col-md-3.responsive-side
= render 'shared/filter', entity: 'merge_request' = render 'shared/filter', entity: 'merge_request'
.col-md-9 .col-md-9
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.row .row
.fixed.sidebar-expand-button.hidden-lg.hidden-md .fixed.sidebar-expand-button.hidden-lg.hidden-md
%i.icon-list.icon-2x %i.fa.fa-list.fa-2x
.col-md-3.responsive-side .col-md-3.responsive-side
= render 'groups/filter', entity: 'milestone' = render 'groups/filter', entity: 'milestone'
.col-md-9 .col-md-9
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
= f.label :avatar, "Group avatar", class: 'control-label' = f.label :avatar, "Group avatar", class: 'control-label'
.col-sm-10 .col-sm-10
%a.choose-btn.btn.btn-small.js-choose-group-avatar-button %a.choose-btn.btn.btn-small.js-choose-group-avatar-button
%i.icon-paper-clip %i.fa.fa-paperclip
%span Choose File ... %span Choose File ...
&nbsp; &nbsp;
%span.file_name.js-avatar-filename File name... %span.file_name.js-avatar-filename File name...
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
- if can? current_user, :manage_group, @group - if can? current_user, :manage_group, @group
.panel-head-actions .panel-head-actions
= link_to new_project_path(namespace_id: @group.id), class: "btn btn-new" do = link_to new_project_path(namespace_id: @group.id), class: "btn btn-new" do
%i.icon-plus %i.fa.fa-plus
New Project New Project
%ul.well-list %ul.well-list
- @projects.each do |project| - @projects.each do |project|
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
.prepend-top-20 .prepend-top-20
= link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do
%strong %strong
%i.icon-rss %i.fa.fa-rss
News Feed News Feed
%hr %hr
......
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
%tr %tr
%td.shortcut %td.shortcut
.key .key
%i.icon-arrow-up %i.fa.fa-arrow-up
%td Move selection up %td Move selection up
%tr %tr
%td.shortcut %td.shortcut
.key .key
%i.icon-arrow-down %i.fa.fa-arrow-down
%td Move selection down %td Move selection down
%tr %tr
%td.shortcut %td.shortcut
...@@ -132,28 +132,28 @@ ...@@ -132,28 +132,28 @@
%tr %tr
%td.shortcut %td.shortcut
.key .key
%i.icon-arrow-left %i.fa.fa-arrow-left
\/ \/
.key h .key h
%td Scroll left %td Scroll left
%tr %tr
%td.shortcut %td.shortcut
.key .key
%i.icon-arrow-right %i.fa.fa-arrow-right
\/ \/
.key l .key l
%td Scroll right %td Scroll right
%tr %tr
%td.shortcut %td.shortcut
.key .key
%i.icon-arrow-up %i.fa.fa-arrow-up
\/ \/
.key k .key k
%td Scroll up %td Scroll up
%tr %tr
%td.shortcut %td.shortcut
.key .key
%i.icon-arrow-down %i.fa.fa-arrow-down
\/ \/
.key j .key j
%td Scroll down %td Scroll down
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
%td.shortcut %td.shortcut
.key .key
shift shift
%i.icon-arrow-up %i.fa.fa-arrow-up
\/ \/
.key .key
shift k shift k
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
%td.shortcut %td.shortcut
.key .key
shift shift
%i.icon-arrow-down %i.fa.fa-arrow-down
\/ \/
.key .key
shift j shift j
......
- if broadcast_message.present? - if broadcast_message.present?
.broadcast-message{ style: broadcast_styling(broadcast_message) } .broadcast-message{ style: broadcast_styling(broadcast_message) }
%i.icon-bullhorn %i.fa.fa-bullhorn
= broadcast_message.message = broadcast_message.message
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
%button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"} %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
%i.icon-reorder %i.fa.fa-bars
.navbar-collapse.collapse .navbar-collapse.collapse
%ul.nav.navbar-nav %ul.nav.navbar-nav
...@@ -18,31 +18,31 @@ ...@@ -18,31 +18,31 @@
= render "layouts/search" = render "layouts/search"
%li.visible-sm.visible-xs %li.visible-sm.visible-xs
= link_to search_path, title: "Search", class: 'has_bottom_tooltip', 'data-original-title' => 'Search area' do = link_to search_path, title: "Search", class: 'has_bottom_tooltip', 'data-original-title' => 'Search area' do
%i.icon-search %i.fa.fa-search
%li %li
= link_to help_path, title: 'Help', class: 'has_bottom_tooltip', = link_to help_path, title: 'Help', class: 'has_bottom_tooltip',
'data-original-title' => 'Help' do 'data-original-title' => 'Help' do
%i.icon-question-sign %i.fa.fa-question-circle
%li %li
= link_to explore_root_path, title: "Explore", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do = link_to explore_root_path, title: "Explore", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
%i.icon-globe %i.fa.fa-globe
%li %li
= link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'My snippets' do = link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'My snippets' do
%i.icon-paste %i.fa.fa-clipboard
- if current_user.is_admin? - if current_user.is_admin?
%li %li
= link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do
%i.icon-cogs %i.fa.fa-cogs
- if current_user.can_create_project? - if current_user.can_create_project?
%li %li
= link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do = link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do
%i.icon-plus %i.fa.fa-plus
%li %li
= link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do = link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do
%i.icon-user %i.fa.fa-user
%li %li
= link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do
%i.icon-signout %i.fa.fa-sign-out
%li.hidden-xs %li.hidden-xs
= link_to current_user, class: "profile-pic", id: 'profile-pic' do = link_to current_user, class: "profile-pic", id: 'profile-pic' do
= image_tag avatar_icon(current_user.email, 26), alt: 'User activity' = image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
%button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"} %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
%i.icon-reorder %i.fa.fa-bars
.pull-right.hidden-xs .pull-right.hidden-xs
= link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-new' = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-new'
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
&nbsp; &nbsp;
.loading-gif.hide .loading-gif.hide
%p %p
%i.icon-spinner.icon-spin %i.fa.fa-spinner.fa-spin
Saving new username Saving new username
%p.light %p.light
= user_url(@user) = user_url(@user)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
- if current_user.can_create_group? - if current_user.can_create_group?
%span.pull-right %span.pull-right
= link_to new_group_path, class: "btn btn-new" do = link_to new_group_path, class: "btn btn-new" do
%i.icon-plus %i.fa.fa-plus
New Group New Group
%p.light %p.light
Group members have access to all a group's projects Group members have access to all a group's projects
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
.pull-right .pull-right
- if can?(current_user, :manage_group, group) - if can?(current_user, :manage_group, group)
= link_to edit_group_path(group), class: "btn-small btn btn-grouped" do = link_to edit_group_path(group), class: "btn-small btn btn-grouped" do
%i.icon-cogs %i.fa.fa-cogs
Settings Settings
- if can?(current_user, :destroy, user_group) - if can?(current_user, :destroy, user_group)
= link_to leave_profile_group_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-small btn btn-grouped", title: 'Remove user from group' do = link_to leave_profile_group_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-small btn btn-grouped", title: 'Remove user from group' do
%i.icon-signout %i.fa.fa-sign-out
Leave Leave
= link_to group, class: 'group-name' do = link_to group, class: 'group-name' do
......
%li %li
%span.notification-icon-holder %span.notification.fa.fa-holder
- if notification.global? - if notification.global?
= notification_icon(@notification) = notification_icon(@notification)
- else - else
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
or change it at #{link_to "gravatar.com", "http://gravatar.com"} or change it at #{link_to "gravatar.com", "http://gravatar.com"}
%hr %hr
%a.choose-btn.btn.btn-small.js-choose-user-avatar-button %a.choose-btn.btn.btn-small.js-choose-user-avatar-button
%i.icon-paper-clip %i.fa.fa-paperclip
%span Choose File ... %span Choose File ...
&nbsp; &nbsp;
%span.file_name.js-avatar-filename File name... %span.file_name.js-avatar-filename File name...
......
- if current_user - if current_user
.dropdown.pull-right .dropdown.pull-right
%a.dropdown-toggle.btn.btn-new{href: '#', "data-toggle" => "dropdown"} %a.dropdown-toggle.btn.btn-new{href: '#', "data-toggle" => "dropdown"}
%i.icon-reorder %i.fa.fa-bars
%ul.dropdown-menu %ul.dropdown-menu
- if @project.issues_enabled && can?(current_user, :write_issue, @project) - if @project.issues_enabled && can?(current_user, :write_issue, @project)
%li %li
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
%li.divider %li.divider
%li %li
= link_to new_project_branch_path(@project) do = link_to new_project_branch_path(@project) do
%i.icon-code-fork %i.fa.fa-code-fork
Git branch Git branch
%li %li
= link_to new_project_tag_path(@project) do = link_to new_project_tag_path(@project) do
%i.icon-tag %i.fa.fa-tag
Git tag Git tag
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
.form-group .form-group
.issue-assignee .issue-assignee
= f.label :assignee_id, class: 'control-label' do = f.label :assignee_id, class: 'control-label' do
%i.icon-user %i.fa.fa-user
Assign to Assign to
.col-sm-10 .col-sm-10
= project_users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]", = project_users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
.form-group .form-group
.issue-milestone .issue-milestone
= f.label :milestone_id, class: 'control-label' do = f.label :milestone_id, class: 'control-label' do
%i.icon-time %i.fa.fa-clock-o
Milestone Milestone
.col-sm-10= f.select(:milestone_id, milestone_options(issuable), .col-sm-10= f.select(:milestone_id, milestone_options(issuable),
{ include_blank: 'Select milestone' }, { class: 'select2' }) { include_blank: 'Select milestone' }, { class: 'select2' })
......
%ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20.project-settings-nav %ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20.project-settings-nav
= nav_link(path: 'projects#edit') do = nav_link(path: 'projects#edit') do
= link_to edit_project_path(@project), class: "stat-tab tab " do = link_to edit_project_path(@project), class: "stat-tab tab " do
%i.icon-edit %i.fa.fa-pencil-square-o
Project Project
= nav_link(controller: [:team_members, :teams]) do = nav_link(controller: [:team_members, :teams]) do
= link_to project_team_index_path(@project), class: "team-tab tab" do = link_to project_team_index_path(@project), class: "team-tab tab" do
%i.icon-group %i.fa.fa-users
Members Members
= nav_link(controller: :deploy_keys) do = nav_link(controller: :deploy_keys) do
= link_to project_deploy_keys_path(@project) do = link_to project_deploy_keys_path(@project) do
%i.icon-key %i.fa.fa-key
Deploy Keys Deploy Keys
= nav_link(controller: :hooks) do = nav_link(controller: :hooks) do
= link_to project_hooks_path(@project) do = link_to project_hooks_path(@project) do
%i.icon-link %i.fa.fa-link
Web Hooks Web Hooks
= nav_link(controller: :services) do = nav_link(controller: :services) do
= link_to project_services_path(@project) do = link_to project_services_path(@project) do
%i.icon-cogs %i.fa.fa-cogs
Services Services
= nav_link(controller: :protected_branches) do = nav_link(controller: :protected_branches) do
= link_to project_protected_branches_path(@project) do = link_to project_protected_branches_path(@project) do
%i.icon-lock %i.fa.fa-lock
Protected branches Protected branches
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#tree-holder.tree-holder #tree-holder.tree-holder
.file-holder .file-holder
.file-title .file-title
%i.icon-file %i.fa.fa-file
%span.file_name %span.file_name
= @path = @path
%small= number_to_human_size @blob.size %small= number_to_human_size @blob.size
......
%ul.breadcrumb.repo-breadcrumb %ul.breadcrumb.repo-breadcrumb
%li %li
%i.icon-angle-right %i.fa.fa-angle-right
= link_to project_tree_path(@project, @ref) do = link_to project_tree_path(@project, @ref) do
= @project.path = @project.path
- tree_breadcrumbs(@tree, 6) do |title, path| - tree_breadcrumbs(@tree, 6) do |title, path|
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
%div#tree-content-holder.tree-content-holder %div#tree-content-holder.tree-content-holder
%article.file-holder %article.file-holder
.file-title.clearfix .file-title.clearfix
%i.icon-file %i.fa.fa-file
%span.file_name %span.file_name
= blob.name = blob.name
%small= number_to_human_size blob.size %small= number_to_human_size blob.size
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
.center .center
= link_to project_raw_path(@project, @id) do = link_to project_raw_path(@project, @id) do
%h1.light %h1.light
%i.icon-download-alt %i.fa.fa-arrow-circle-o-down-alt
%h4 %h4
Download (#{number_to_human_size blob.size}) Download (#{number_to_human_size blob.size})
...@@ -7,19 +7,19 @@ ...@@ -7,19 +7,19 @@
%span.label.label-info default %span.label.label-info default
- if @project.protected_branch? branch.name - if @project.protected_branch? branch.name
%span.label.label-success %span.label.label-success
%i.icon-lock %i.fa.fa-lock
protected protected
.pull-right .pull-right
- if can?(current_user, :download_code, @project) - if can?(current_user, :download_code, @project)
= render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'btn-grouped btn-group-small' = render 'projects/repositories/download_archive', ref: branch.name, btn_class: 'btn-grouped btn-group-small'
- if branch.name != @repository.root_ref - if branch.name != @repository.root_ref
= link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-small', method: :post, title: "Compare" do = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-small', method: :post, title: "Compare" do
%i.icon-copy %i.fa.fa-files-o
Compare Compare
- if can_remove_branch?(@project, branch.name) - if can_remove_branch?(@project, branch.name)
= link_to project_branch_path(@project, branch.name), class: 'btn btn-grouped btn-small btn-remove remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do = link_to project_branch_path(@project, branch.name), class: 'btn btn-grouped btn-small btn-remove remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do
%i.icon-trash %i.fa.fa-trash-o
- if commit - if commit
%ul.list-unstyled %ul.list-unstyled
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.pull-right .pull-right
- if can? current_user, :push_code, @project - if can? current_user, :push_code, @project
= link_to new_project_branch_path(@project), class: 'btn btn-create' do = link_to new_project_branch_path(@project), class: 'btn btn-create' do
%i.icon-add-sign %i.fa.fa-add-sign
New branch New branch
&nbsp; &nbsp;
.dropdown.inline .dropdown.inline
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%button{ type: "button", class: "close", "data-dismiss" => "alert"} &times; %button{ type: "button", class: "close", "data-dismiss" => "alert"} &times;
= @error = @error
%h3.page-title %h3.page-title
%i.icon-code-fork %i.fa.fa-code-fork
New branch New branch
= form_tag project_branches_path, method: :post, class: "form-horizontal" do = form_tag project_branches_path, method: :post, class: "form-horizontal" do
.form-group .form-group
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
%div %div
- if @notes_count > 0 - if @notes_count > 0
%span.btn.disabled.btn-grouped %span.btn.disabled.btn-grouped
%i.icon-comment %i.fa.fa-comment
= @notes_count = @notes_count
.pull-left.btn-group .pull-left.btn-group
%a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} } %a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} }
%i.icon-download-alt %i.fa.fa-arrow-circle-o-down-alt
Download as Download as
%span.caret %span.caret
%ul.dropdown-menu %ul.dropdown-menu
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
- if note_count > 0 - if note_count > 0
%span.label.label-gray %span.label.label-gray
%i.icon-comment= note_count %i.fa.fa-comment= note_count
- if commit.description? - if commit.description?
.commit-row-description.js-toggle-content .commit-row-description.js-toggle-content
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.row.commits-row .row.commits-row
.col-md-2 .col-md-2
%h4 %h4
%i.icon-calendar %i.fa.fa-calendar
%span= day.stamp("28 Aug, 2010") %span= day.stamp("28 Aug, 2010")
%p= pluralize(commits.count, 'commit') %p= pluralize(commits.count, 'commit')
.col-md-10 .col-md-10
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- if current_user && current_user.private_token - if current_user && current_user.private_token
.commits-feed-holder.hidden-xs.hidden-sm .commits-feed-holder.hidden-xs.hidden-sm
= link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed", class: 'btn' do = link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed", class: 'btn' do
%i.icon-rss %i.fa.fa-rss
Commits feed Commits feed
%ul.breadcrumb.repo-breadcrumb %ul.breadcrumb.repo-breadcrumb
......
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
.pull-right .pull-right
- if @available_keys.include?(deploy_key) - if @available_keys.include?(deploy_key)
= link_to enable_project_deploy_key_path(@project, deploy_key), class: 'btn btn-small', method: :put do = link_to enable_project_deploy_key_path(@project, deploy_key), class: 'btn btn-small', method: :put do
%i.icon-plus %i.fa.fa-plus
Enable Enable
- else - else
- if deploy_key.projects.count > 1 - if deploy_key.projects.count > 1
= link_to disable_project_deploy_key_path(@project, deploy_key), class: 'btn btn-small', method: :put do = link_to disable_project_deploy_key_path(@project, deploy_key), class: 'btn btn-small', method: :put do
%i.icon-off %i.fa.fa-power-off
Disable Disable
- else - else
= link_to 'Remove', project_deploy_key_path(@project, deploy_key), data: { confirm: 'You are going to remove deploy key. Are you sure?'}, method: :delete, class: "btn btn-remove delete-key btn-small pull-right" = link_to 'Remove', project_deploy_key_path(@project, deploy_key), data: { confirm: 'You are going to remove deploy key. Are you sure?'}, method: :delete, class: "btn btn-remove delete-key btn-small pull-right"
= link_to project_deploy_key_path(deploy_key.projects.include?(@project) ? @project : deploy_key.projects.first, deploy_key) do = link_to project_deploy_key_path(deploy_key.projects.include?(@project) ? @project : deploy_key.projects.first, deploy_key) do
%i.icon-key %i.fa.fa-key
%strong= deploy_key.title %strong= deploy_key.title
%p.light.prepend-top-10 %p.light.prepend-top-10
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Deploy keys allow read-only access to the repository Deploy keys allow read-only access to the repository
= link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do = link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do
%i.icon-plus %i.fa.fa-plus
New Deploy Key New Deploy Key
%p.light %p.light
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
Wrap text Wrap text
&nbsp; &nbsp;
= link_to '#', class: 'js-toggle-diff-comments btn btn-small' do = link_to '#', class: 'js-toggle-diff-comments btn btn-small' do
%i.icon-chevron-down %i.fa.fa-chevron-down
Diff comments Diff comments
&nbsp; &nbsp;
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
&nbsp; &nbsp;
= link_to '#', class: 'btn btn-small js-toggle-button' do = link_to '#', class: 'btn btn-small js-toggle-button' do
Show diff stats Show diff stats
%i.icon-chevron-down %i.fa.fa-chevron-down
.file-stats.js-toggle-content.hide .file-stats.js-toggle-content.hide
%ul.bordered-list %ul.bordered-list
- diffs.each_with_index do |diff, i| - diffs.each_with_index do |diff, i|
...@@ -19,23 +19,23 @@ ...@@ -19,23 +19,23 @@
- if diff.deleted_file - if diff.deleted_file
%span.deleted-file %span.deleted-file
%a{href: "#diff-#{i}"} %a{href: "#diff-#{i}"}
%i.icon-minus %i.fa.fa-minus
= diff.old_path = diff.old_path
- elsif diff.renamed_file - elsif diff.renamed_file
%span.renamed-file %span.renamed-file
%a{href: "#diff-#{i}"} %a{href: "#diff-#{i}"}
%i.icon-minus %i.fa.fa-minus
= diff.old_path = diff.old_path
\-> \->
= diff.new_path = diff.new_path
- elsif diff.new_file - elsif diff.new_file
%span.new-file %span.new-file
%a{href: "#diff-#{i}"} %a{href: "#diff-#{i}"}
%i.icon-plus %i.fa.fa-plus
= diff.new_path = diff.new_path
- else - else
%span.edit-file %span.edit-file
%a{href: "#diff-#{i}"} %a{href: "#diff-#{i}"}
%i.icon-adjust %i.fa.fa-adjust
= diff.new_path = diff.new_path
...@@ -89,13 +89,13 @@ ...@@ -89,13 +89,13 @@
.danger-settings.js-toggle-container .danger-settings.js-toggle-container
.centered-light-block .centered-light-block
%h3 %h3
%i.icon-warning-sign %i.fa.fa-exclamation-triangle
Dangerous settings Dangerous settings
%p Project settings below may result in data loss! %p Project settings below may result in data loss!
= link_to '#', class: 'btn js-toggle-button' do = link_to '#', class: 'btn js-toggle-button' do
Show them to me Show them to me
%i.icon-chevron-down %i.fa.fa-chevron-down
.js-toggle-content.hide .js-toggle-content.hide
- if can? current_user, :archive_project, @project - if can? current_user, :archive_project, @project
...@@ -185,6 +185,6 @@ ...@@ -185,6 +185,6 @@
.save-project-loader.hide .save-project-loader.hide
.center .center
%h2 %h2
%i.icon-spinner.icon-spin %i.fa.fa-spinner.fa-spin
Saving project. Saving project.
%p Please wait a moment, this page will automatically refresh when ready. %p Please wait a moment, this page will automatically refresh when ready.
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do = form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do
.file-holder.file .file-holder.file
.file-title .file-title
%i.icon-file %i.fa.fa-file
%span.file_name %span.file_name
%span.monospace.light #{@ref}: %span.monospace.light #{@ref}:
= @path = @path
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
.js-edit-mode-pane#preview.hide .js-edit-mode-pane#preview.hide
.center .center
%h2 %h2
%i.icon-spinner.icon-spin %i.fa.fa-spinner.fa-spin
.form-group.commit_message-group .form-group.commit_message-group
= label_tag 'commit_message', class: "control-label" do = label_tag 'commit_message', class: "control-label" do
......
.alert.alert-danger.alert-block .alert.alert-danger.alert-block
%h4 %h4
%i.icon-code-fork %i.fa.fa-code-fork
Fork Error! Fork Error!
%p %p
You tried to fork You tried to fork
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
%p %p
= link_to fork_project_path(@project), title: "Fork", class: "btn", method: "POST" do = link_to fork_project_path(@project), title: "Fork", class: "btn", method: "POST" do
%i.icon-code-fork %i.fa.fa-code-fork
Try to Fork again Try to Fork again
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.loading-graph .loading-graph
.center .center
%h3.page-title %h3.page-title
%i.icon-spinner.icon-spin %i.fa.fa-spinner.fa-spin
Building repository graph. Building repository graph.
%p.slead Please wait a moment, this page will automatically refresh when ready. %p.slead Please wait a moment, this page will automatically refresh when ready.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.save-project-loader .save-project-loader
.center .center
%h2 %h2
%i.icon-spinner.icon-spin %i.fa.fa-spinner.fa-spin
Import in progress. Import in progress.
%p.monospace git clone --bare #{hidden_pass_url(@project.import_url)} %p.monospace git clone --bare #{hidden_pass_url(@project.import_url)}
%p Please wait while we import the repository for you. Refresh at will. %p Please wait while we import the repository for you. Refresh at will.
......
...@@ -10,18 +10,18 @@ ...@@ -10,18 +10,18 @@
- if current_controller?(:milestones) - if current_controller?(:milestones)
%li.pull-right %li.pull-right
%button.btn.btn-default.sidebar-expand-button %button.btn.btn-default.sidebar-expand-button
%i.icon.icon-list %i.icon.fa.fa-list
- if current_controller?(:issues) - if current_controller?(:issues)
- if current_user - if current_user
%li %li
= link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do = link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
%i.icon-rss %i.fa.fa-rss
%li.pull-right %li.pull-right
.pull-right .pull-right
%button.btn.btn-default.sidebar-expand-button %button.btn.btn-default.sidebar-expand-button
%i.icon.icon-list %i.icon.fa.fa-list
= form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-left issue-search-form' do = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-left issue-search-form' do
.append-right-10.hidden-xs.hidden-sm .append-right-10.hidden-xs.hidden-sm
= search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input input-mn-300' } = search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input input-mn-300' }
...@@ -32,5 +32,5 @@ ...@@ -32,5 +32,5 @@
= hidden_field_tag :label_id, params['label_id'] = hidden_field_tag :label_id, params['label_id']
- if can? current_user, :write_issue, @project - if can? current_user, :write_issue, @project
= link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-left", title: "New Issue", id: "new_issue_link" do = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-left", title: "New Issue", id: "new_issue_link" do
%i.icon-plus %i.fa.fa-plus
New Issue New Issue
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
= render 'votes/votes_inline', votable: issue = render 'votes/votes_inline', votable: issue
- if issue.notes.any? - if issue.notes.any?
%span %span
%i.icon-comments %i.fa.fa-comments
= issue.notes.count = issue.notes.count
- if issue.milestone - if issue.milestone
%span %span
%i.icon-time %i.fa.fa-clock-o
= issue.milestone.title = issue.milestone.title
.pull-right .pull-right
%small updated #{time_ago_with_tooltip(issue.updated_at, 'bottom', 'issue_update_ago')} %small updated #{time_ago_with_tooltip(issue.updated_at, 'bottom', 'issue_update_ago')}
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
- else - else
= link_to 'Close', project_issue_path(issue.project, issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-small btn-grouped close_issue btn-close", remote: true = link_to 'Close', project_issue_path(issue.project, issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-small btn-grouped close_issue btn-close", remote: true
= link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link btn-grouped" do = link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link btn-grouped" do
%i.icon-edit %i.fa.fa-pencil-square-o
Edit Edit
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.issues-filters .issues-filters
.dropdown.inline .dropdown.inline
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
%i.icon-user %i.fa.fa-user
%span.light assignee: %span.light assignee:
- if @assignee.present? - if @assignee.present?
%strong= @assignee.name %strong= @assignee.name
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
.dropdown.inline.prepend-left-10 .dropdown.inline.prepend-left-10
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
%i.icon-time %i.fa.fa-clock-o
%span.light milestone: %span.light milestone:
- if @milestone.present? - if @milestone.present?
%strong= @milestone.title %strong= @milestone.title
......
= render "head" = render "head"
.row .row
.fixed.fixed.sidebar-expand-button.hidden-lg.hidden-md.hidden-xs .fixed.fixed.sidebar-expand-button.hidden-lg.hidden-md.hidden-xs
%i.icon-list.icon-2x %i.fa.fa-list.fa-2x
.col-md-3.responsive-side .col-md-3.responsive-side
= render 'shared/project_filter', project_entities_path: project_issues_path(@project), = render 'shared/project_filter', project_entities_path: project_issues_path(@project),
labels: true, redirect: 'issues', entity: 'issue' labels: true, redirect: 'issues', entity: 'issue'
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%span.pull-right.issue-btn-group %span.pull-right.issue-btn-group
- if can?(current_user, :write_issue, @project) - if can?(current_user, :write_issue, @project)
= link_to new_project_issue_path(@project), class: "btn btn-grouped", title: "New Issue", id: "new_issue_link" do = link_to new_project_issue_path(@project), class: "btn btn-grouped", title: "New Issue", id: "new_issue_link" do
%i.icon-plus %i.fa.fa-plus
New Issue New Issue
- if can?(current_user, :modify_issue, @issue) - if can?(current_user, :modify_issue, @issue)
- if @issue.closed? - if @issue.closed?
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
= link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close", title: "Close Issue" = link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close", title: "Close Issue"
= link_to edit_project_issue_path(@project, @issue), class: "btn btn-grouped" do = link_to edit_project_issue_path(@project, @issue), class: "btn btn-grouped" do
%i.icon-edit %i.fa.fa-pencil-square-o
Edit Edit
.clearfix .clearfix
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
= link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title" = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
- if merge_request.merged? - if merge_request.merged?
%small.pull-right %small.pull-right
%i.icon-ok %i.fa.fa-check
MERGED MERGED
- else - else
%span.pull-right %span.pull-right
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
%span.light %span.light
#{merge_request.source_project_namespace}: #{merge_request.source_project_namespace}:
= truncate merge_request.source_branch, length: 25 = truncate merge_request.source_branch, length: 25
%i.icon-angle-right.light %i.fa.fa-angle-right.light
= merge_request.target_branch = merge_request.target_branch
.merge-request-info .merge-request-info
- if merge_request.author - if merge_request.author
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
= render 'votes/votes_inline', votable: merge_request = render 'votes/votes_inline', votable: merge_request
- if merge_request.notes.any? - if merge_request.notes.any?
%span %span
%i.icon-comments %i.fa.fa-comments
= merge_request.mr_and_commit_notes.count = merge_request.mr_and_commit_notes.count
- if merge_request.milestone_id? - if merge_request.milestone_id?
%span %span
%i.icon-time %i.fa.fa-clock-o
= merge_request.milestone.title = merge_request.milestone.title
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
.form-group .form-group
.issue-assignee .issue-assignee
= f.label :assignee_id do = f.label :assignee_id do
%i.icon-user %i.fa.fa-user
Assign to Assign to
%div %div
= project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id, project_id: @merge_request.target_project_id) = project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id, project_id: @merge_request.target_project_id)
...@@ -39,12 +39,12 @@ ...@@ -39,12 +39,12 @@
.form-group .form-group
.issue-milestone .issue-milestone
= f.label :milestone_id do = f.label :milestone_id do
%i.icon-time %i.fa.fa-clock-o
Milestone Milestone
%div= f.select(:milestone_id, milestone_options(@merge_request), { include_blank: "Select milestone" }, {class: 'select2'}) %div= f.select(:milestone_id, milestone_options(@merge_request), { include_blank: "Select milestone" }, {class: 'select2'})
.form-group .form-group
= f.label :label_ids do = f.label :label_ids do
%i.icon-tag %i.fa.fa-tag
Labels Labels
%div %div
= f.collection_select :label_ids, @merge_request.target_project.labels.all, :id, :name, { selected: @merge_request.label_ids }, multiple: true, class: 'select2' = f.collection_select :label_ids, @merge_request.target_project.labels.all, :id, :name, { selected: @merge_request.label_ids }, multiple: true, class: 'select2'
......
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
%ul.nav.nav-pills.merge-request-tabs %ul.nav.nav-pills.merge-request-tabs
%li.notes-tab{data: {action: 'notes'}} %li.notes-tab{data: {action: 'notes'}}
= link_to project_merge_request_path(@project, @merge_request) do = link_to project_merge_request_path(@project, @merge_request) do
%i.icon-comment %i.fa.fa-comment
Discussion Discussion
%span.badge= @merge_request.mr_and_commit_notes.count %span.badge= @merge_request.mr_and_commit_notes.count
%li.diffs-tab{data: {action: 'diffs'}} %li.diffs-tab{data: {action: 'diffs'}}
= link_to diffs_project_merge_request_path(@project, @merge_request) do = link_to diffs_project_merge_request_path(@project, @merge_request) do
%i.icon-list-alt %i.fa.fa-list-alt
Changes Changes
%span.badge= @merge_request.diffs.size %span.badge= @merge_request.diffs.size
......
- if can? current_user, :write_merge_request, @project - if can? current_user, :write_merge_request, @project
= link_to new_project_merge_request_path(@project), class: "pull-right btn btn-new", title: "New Merge Request" do = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-new", title: "New Merge Request" do
%i.icon-plus %i.fa.fa-plus
New Merge Request New Merge Request
%h3.page-title %h3.page-title
Merge Requests Merge Requests
%hr %hr
.row .row
.fixed.sidebar-expand-button.hidden-lg.hidden-md .fixed.sidebar-expand-button.hidden-lg.hidden-md
%i.icon-list.icon-2x %i.fa.fa-list.fa-2x
.col-md-3.responsive-side .col-md-3.responsive-side
= render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project), = render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project),
labels: true, redirect: 'merge_requests', entity: 'merge_request' labels: true, redirect: 'merge_requests', entity: 'merge_request'
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
.mr-filters.append-bottom-10 .mr-filters.append-bottom-10
.dropdown.inline .dropdown.inline
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
%i.icon-user %i.fa.fa-user
%span.light assignee: %span.light assignee:
- if @assignee.present? - if @assignee.present?
%strong= @assignee.name %strong= @assignee.name
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
.dropdown.inline.prepend-left-10 .dropdown.inline.prepend-left-10
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
%i.icon-time %i.fa.fa-clock-o
%span.light milestone: %span.light milestone:
- if @milestone.present? - if @milestone.present?
%strong= @milestone.title %strong= @milestone.title
......
- if @commits.present? - if @commits.present?
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
%i.icon-list %i.fa.fa-list
Commits (#{@commits.count}) Commits (#{@commits.count})
.commits.mr-commits .commits.mr-commits
- if @commits.count > 8 - if @commits.count > 8
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
.automerge_widget.unchecked .automerge_widget.unchecked
%p %p
%strong %strong
%i.icon-spinner.icon-spin %i.fa.fa-spinner.fa-spin
Checking for ability to automatically merge… Checking for ability to automatically merge…
.automerge_widget.already_cannot_be_merged.hide .automerge_widget.already_cannot_be_merged.hide
...@@ -72,6 +72,6 @@ ...@@ -72,6 +72,6 @@
.merge-in-progress.hide .merge-in-progress.hide
%p %p
%i.icon-spinner.icon-spin %i.fa.fa-spinner.fa-spin
&nbsp; &nbsp;
Merge is in progress. Please wait. Page will be automatically reloaded. &nbsp; Merge is in progress. Please wait. Page will be automatically reloaded. &nbsp;
- if @commits.any? - if @commits.any?
.ci_widget.ci-success{style: "display:none"} .ci_widget.ci-success{style: "display:none"}
%i.icon-ok %i.fa.fa-check
%span CI build passed %span CI build passed
for #{@merge_request.last_commit_short_sha}. for #{@merge_request.last_commit_short_sha}.
= link_to "Build page", ci_build_details_path(@merge_request) = link_to "Build page", ci_build_details_path(@merge_request)
.ci_widget.ci-failed{style: "display:none"} .ci_widget.ci-failed{style: "display:none"}
%i.icon-remove %i.fa.fa-times
%span CI build failed %span CI build failed
for #{@merge_request.last_commit_short_sha}. for #{@merge_request.last_commit_short_sha}.
= link_to "Build page", ci_build_details_path(@merge_request) = link_to "Build page", ci_build_details_path(@merge_request)
- [:running, :pending].each do |status| - [:running, :pending].each do |status|
.ci_widget{class: "ci-#{status}", style: "display:none"} .ci_widget{class: "ci-#{status}", style: "display:none"}
%i.icon-time %i.fa.fa-clock-o
%span CI build #{status} %span CI build #{status}
for #{@merge_request.last_commit_short_sha}. for #{@merge_request.last_commit_short_sha}.
= link_to "Build page", ci_build_details_path(@merge_request) = link_to "Build page", ci_build_details_path(@merge_request)
.ci_widget .ci_widget
%strong %strong
%i.icon-spinner %i.fa.fa-spinner
Checking for CI status for #{@merge_request.last_commit_short_sha} Checking for CI status for #{@merge_request.last_commit_short_sha}
.ci_widget.ci-error{style: "display:none"} .ci_widget.ci-error{style: "display:none"}
%i.icon-remove %i.fa.fa-times
%span Cannot connect to the CI server. Please check your settings and try again. %span Cannot connect to the CI server. Please check your settings and try again.
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- if @merge_request.open? - if @merge_request.open?
.btn-group.pull-left .btn-group.pull-left
%a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} } %a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} }
%i.icon-download-alt %i.fa.fa-arrow-circle-o-down-alt
Download as Download as
%span.caret %span.caret
%ul.dropdown-menu %ul.dropdown-menu
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
= link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: { state_event: :close }), method: :put, class: "btn btn-grouped btn-close", title: "Close merge request" = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: { state_event: :close }), method: :put, class: "btn btn-grouped btn-close", title: "Close merge request"
= link_to edit_project_merge_request_path(@project, @merge_request), class: "btn btn-grouped", id:"edit_merge_request" do = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn btn-grouped", id:"edit_merge_request" do
%i.icon-edit %i.fa.fa-pencil-square-o
Edit Edit
- if @merge_request.closed? - if @merge_request.closed?
= link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request" = link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request"
......
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
.remove_source_branch_widget .remove_source_branch_widget
%p Changes merged into #{@merge_request.target_branch}. You can remove source branch now %p Changes merged into #{@merge_request.target_branch}. You can remove source branch now
= link_to project_branch_path(@merge_request.source_project, @source_branch), remote: true, method: :delete, class: "btn btn-primary btn-small remove_source_branch" do = link_to project_branch_path(@merge_request.source_project, @source_branch), remote: true, method: :delete, class: "btn btn-primary btn-small remove_source_branch" do
%i.icon-remove %i.fa.fa-times
Remove Source Branch Remove Source Branch
.remove_source_branch_widget.failed.hide .remove_source_branch_widget.failed.hide
Failed to remove source branch '#{@merge_request.source_branch}' Failed to remove source branch '#{@merge_request.source_branch}'
.remove_source_branch_in_progress.hide .remove_source_branch_in_progress.hide
%i.icon-refresh.icon-spin %i.fa.fa-refresh.fa-spin
&nbsp; &nbsp;
Removing source branch '#{@merge_request.source_branch}'. Please wait. Page will be automatically reloaded. &nbsp; Removing source branch '#{@merge_request.source_branch}'. Please wait. Page will be automatically reloaded. &nbsp;
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
- if !@closes_issues.empty? && @merge_request.open? - if !@closes_issues.empty? && @merge_request.open?
.panel-footer .panel-footer
%span %span
%i.icon-ok %i.fa.fa-check
Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'} Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
= succeed '.' do = succeed '.' do
!= gfm(issues_sentence(@closes_issues)) != gfm(issues_sentence(@closes_issues))
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.pull-right .pull-right
- if can?(current_user, :admin_milestone, milestone.project) and milestone.active? - if can?(current_user, :admin_milestone, milestone.project) and milestone.active?
= link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link btn-grouped" do = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link btn-grouped" do
%i.icon-edit %i.fa.fa-pencil-square-o
Edit Edit
= link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-small btn-close" = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-small btn-close"
%h4 %h4
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
Milestones Milestones
- if can? current_user, :admin_milestone, @project - if can? current_user, :admin_milestone, @project
= link_to new_project_milestone_path(@project), class: "pull-right btn btn-new", title: "New Milestone" do = link_to new_project_milestone_path(@project), class: "pull-right btn btn-new", title: "New Milestone" do
%i.icon-plus %i.fa.fa-plus
New Milestone New Milestone
.row .row
.fixed.sidebar-expand-button.hidden-lg.hidden-md.hidden-xs .fixed.sidebar-expand-button.hidden-lg.hidden-md.hidden-xs
%i.icon-list.icon-2x %i.fa.fa-list.fa-2x
.col-md-3.responsive-side .col-md-3.responsive-side
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
%li{class: ("active" if (params[:f] == "active" || !params[:f]))} %li{class: ("active" if (params[:f] == "active" || !params[:f]))}
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.pull-right .pull-right
- if can?(current_user, :admin_milestone, @project) - if can?(current_user, :admin_milestone, @project)
= link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped" do = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped" do
%i.icon-edit %i.fa.fa-pencil-square-o
Edit Edit
- if @milestone.active? - if @milestone.active?
= link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-close btn-grouped" = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-close btn-grouped"
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
.pull-right .pull-right
= link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small btn-grouped", title: "New Issue" do = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small btn-grouped", title: "New Issue" do
%i.icon-plus %i.fa.fa-plus
New Issue New Issue
= link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn btn-small edit-milestone-link btn-grouped" = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn btn-small edit-milestone-link btn-grouped"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
= form_tag project_network_path(@project, @id), method: :get, class: 'form-inline network-form' do |f| = form_tag project_network_path(@project, @id), method: :get, class: 'form-inline network-form' do |f|
= text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: 'search-input form-control input-mx-250 search-sha' = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: 'search-input form-control input-mx-250 search-sha'
= button_tag class: 'btn btn-success btn-search-sha' do = button_tag class: 'btn btn-success btn-search-sha' do
%i.icon-search %i.fa.fa-search
.inline.prepend-left-20 .inline.prepend-left-20
.checkbox.light .checkbox.light
= label_tag :filter_ref do = label_tag :filter_ref do
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
.col-sm-2 .col-sm-2
.col-sm-10 .col-sm-10
= link_to "#", class: 'js-toggle-button' do = link_to "#", class: 'js-toggle-button' do
%i.icon-edit %i.fa.fa-pencil-square-o
%span Customize repository name? %span Customize repository name?
.js-toggle-content.hide .js-toggle-content.hide
.form-group .form-group
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
.col-sm-2 .col-sm-2
.col-sm-10 .col-sm-10
= link_to "#", class: 'js-toggle-button' do = link_to "#", class: 'js-toggle-button' do
%i.icon-upload-alt %i.fa.fa-upload
%span Import existing repository? %span Import existing repository?
.js-toggle-content.hide .js-toggle-content.hide
.form-group.import-url-data .form-group.import-url-data
...@@ -74,6 +74,6 @@ ...@@ -74,6 +74,6 @@
.save-project-loader.hide .save-project-loader.hide
.center .center
%h2 %h2
%i.icon-spinner.icon-spin %i.fa.fa-spinner.fa-spin
Creating project &amp; repository. Creating project &amp; repository.
%p Please wait a moment, this page will automatically refresh when ready. %p Please wait a moment, this page will automatically refresh when ready.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment