Skip to content

Commit

Permalink
Merge pull request #158 from Fullscreen/bump-libraries
Browse files Browse the repository at this point in the history
Bump CDN versions of Bootstrap + Font Awesome
  • Loading branch information
claudiofullscreen committed Mar 11, 2016
2 parents e8346d4 + 89f0056 commit 88a6398
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ For more information about changelogs, check
[Keep a Changelog](http://keepachangelog.com) and
[Vandamme](http://tech-angels.github.io/vandamme).

## 1.3.6 - 2015-12-18

* [ENHANCEMENT] Bump versions of asset libraries

## 1.3.5 - 2015-12-18

* [ENHANCEMENT] Replace `errors.get(:field)` with `errors[:field]` since the former is deprecated in Rails 5.
Expand Down
1 change: 0 additions & 1 deletion gemfiles/Gemfile.rails-3.x
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ gem 'activesupport', '~> 3.2'
gem 'actionpack', '~> 3.2'
gem 'activemodel', '~> 3.2'
gem 'middleman-core', '~> 3.2.2'
gem 'tins', '< 1.6.0'

gemspec path: '../'
4 changes: 2 additions & 2 deletions lib/bh/classes/cdn.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ class Cdn
# @note if unspecified, the version should match the latest available
# version. If that's not the case, it's a bug and should be fixed.
def self.bootstrap(options = {})
options[:version] ||= '3.3.2'
options[:version] ||= '3.3.6'
cdn_asset options.merge(library: 'bootstrap')
end

# @note if unspecified, the version should match the latest available
# version. If that's not the case, it's a bug and should be fixed.
def self.font_awesome(options = {})
options[:version] ||= '4.3.0'
options[:version] ||= '4.5.0'
cdn_asset options.merge(library: 'font-awesome')
end

Expand Down
2 changes: 1 addition & 1 deletion lib/bh/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Bh
VERSION = '1.3.5'
VERSION = '1.3.6'
end

0 comments on commit 88a6398

Please sign in to comment.