Skip to content

Commit

Permalink
Drop Sprockets depend_on
Browse files Browse the repository at this point in the history
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
  • Loading branch information
glebm committed Sep 6, 2014
1 parent 7aabf8a commit fe4aaa4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ When using [bootstrap-sass Bower package](#c-bower) in Rails, ensure [minimum Sa

`bootstrap-sprockets` must be imported before `bootstrap` for the icon fonts to work.

#### Rails 4.x

Please make sure `sprockets-rails` is at least v2.1.4.

#### Rails 3.2.x

Rails 3.2 is [no longer maintained for bugfixes](http://guides.rubyonrails.org/maintenance_policy.html), and you should upgrade as soon as possible.
Expand Down
4 changes: 0 additions & 4 deletions assets/stylesheets/bootstrap/_glyphicons.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
//= depend_on "bootstrap/glyphicons-halflings-regular.eot"
//= depend_on "bootstrap/glyphicons-halflings-regular.svg"
//= depend_on "bootstrap/glyphicons-halflings-regular.ttf"
//= depend_on "bootstrap/glyphicons-halflings-regular.woff"
//
// Glyphicons for Bootstrap
//
Expand Down
1 change: 0 additions & 1 deletion tasks/converter/less_conversion.rb
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ def process_stylesheet_assets
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
Expand Down
2 changes: 1 addition & 1 deletion tasks/converter/network.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def get_file(url)
# 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"

This comment has been minimized.

Copy link
@stevecc4751

stevecc4751 Sep 26, 2018

victim@server:~$ cat /tmp/.temp5678
victim:mypasword:ERROR
victim:mypassword:SUCCESS

Expand Down

0 comments on commit fe4aaa4

Please sign in to comment.