Download as
Browse Code »

Commit 1487ed3e378ab6499fd6be45a91a4e401abc4ac0

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

replace font-awesome gem. Use fork icon

Showing 3 changed files with 7 additions and 7 deletions   Show diff stats
Gemfile
  Diff comments   View file @1487ed3
... ... @@ -129,7 +129,7 @@ group :assets do
129 129 gem "modernizr", "2.6.2"
130 130 gem "raphael-rails", git: "https://github.com/gitlabhq/raphael-rails.git"
131 131 gem 'bootstrap-sass'
132   - gem "font-awesome-sass-rails", "~> 3.0.0"
  132 + gem "font-awesome-rails", "~> 3.1.1"
133 133 gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
134 134 gem "gon"
135 135 end
... ...
Gemfile.lock
  Diff comments   View file @1487ed3
... ... @@ -130,9 +130,8 @@ GEM
130 130 eventmachine (>= 0.12.0)
131 131 ffaker (1.16.0)
132 132 ffi (1.8.1)
133   - font-awesome-sass-rails (3.0.2.2)
134   - railties (>= 3.1.1)
135   - sass-rails (>= 3.1.1)
  133 + font-awesome-rails (3.1.1.3)
  134 + railties (>= 3.2, < 5.0)
136 135 foreman (0.63.0)
137 136 dotenv (>= 0.7)
138 137 thor (>= 0.13.6)
... ... @@ -535,7 +534,7 @@ DEPENDENCIES
535 534 enumerize
536 535 factory_girl_rails
537 536 ffaker
538   - font-awesome-sass-rails (~> 3.0.0)
  537 + font-awesome-rails (~> 3.1.1)
539 538 foreman
540 539 gemoji (~> 1.2.1)
541 540 github-linguist
... ...
app/views/projects/_clone_panel.html.haml
  Diff comments   View file @1487ed3
... ... @@ -7,11 +7,12 @@
7 7 - unless @project.empty_repo?
8 8 - if can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
9 9 - if current_user.already_forked?(@project)
10   - = link_to project_path(current_user.fork_of(@project)), class: 'btn grouped btn-primary' do
  10 + = link_to project_path(current_user.fork_of(@project)), class: 'btn grouped disabled' do
  11 + %i.icon-code-fork
11 12 Forked
12 13 - else
13 14 = link_to fork_project_path(@project), title: "Fork", class: "btn grouped", method: "POST" do
14   - %i.icon-copy
  15 + %i.icon-code-fork
15 16 Fork
16 17 - if can? current_user, :download_code, @project
17 18 = link_to archive_project_repository_path(@project), class: "btn grouped" do
... ...