diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-09-06 05:39:24 +0400 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-09-06 05:59:01 +0400 |
| commit | fe4aaa4b8a98e8b2f32f2d2e7f1c616d68417087 (patch) | |
| tree | 3c91089fc16b537e42804d56957c71092368d2b3 /tasks | |
| parent | 7aabf8a25a195a232677eea7482df7cbc7447744 (diff) | |
Drop Sprockets `depend_on`
Sprockets does not require depend_on for our use case since v2.1.4
Drop the directives, and instruct Rails users to use sprockets-rails
v2.1.4+.
Profit: Bower package can now be used from Rails
Related issues: #592, #689
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/converter/less_conversion.rb | 1 | ||||
| -rw-r--r-- | tasks/converter/network.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tasks/converter/less_conversion.rb b/tasks/converter/less_conversion.rb index a903aec5..389ebf53 100644 --- a/tasks/converter/less_conversion.rb +++ b/tasks/converter/less_conversion.rb @@ -114,7 +114,6 @@ class Converter when 'thumbnails.less', 'labels.less', 'badges.less' file = extract_nested_rule file, 'a&' when 'glyphicons.less' - file = bootstrap_font_files.map { |p| %Q(//= depend_on "bootstrap/#{File.basename(p)}") } * "\n" + "\n" + file file = replace_rules(file, '@font-face') { |rule| rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}' replace_asset_url rule, :font diff --git a/tasks/converter/network.rb b/tasks/converter/network.rb index 1404b65b..848778a4 100644 --- a/tasks/converter/network.rb +++ b/tasks/converter/network.rb @@ -60,7 +60,7 @@ class Converter # get sha of the branch (= the latest commit) def get_branch_sha @branch_sha ||= begin - if %x[git rev-parse #@branch].chomp == @branch + if @branch + "\n" == %x[git rev-parse #@branch] @branch else cmd = "git ls-remote #{Shellwords.escape "https://github.com/#@repo"} #@branch" |