Skip to content

Commit

Permalink
Merge pull request gregschmit#86 from GetJobber/rename_all_scss
Browse files Browse the repository at this point in the history
renaming all the .css.scsses
  • Loading branch information
X0nic committed Sep 24, 2015
2 parents 366cfd3 + cc89ef6 commit 9a33735
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 55 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ rvm:
- 2.2.0
- jruby-19mode
gemfile:
- spec/gemfiles/Gemfile.rails-3.2.x
- spec/gemfiles/Gemfile.rails-4.0.x
- spec/gemfiles/Gemfile.rails-4.1.x
- spec/gemfiles/Gemfile.rails-4.2.x
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 2.0.0 / 2015-09-24

* [BREAKING-CHANGE] Dropping support for rails 3.X - Upgrade to sass-rails 4
* [FIX] Rename all css.scss to .scss [#86](https://github.com/GetJobber/recurring_select/pull/86)

# 1.2.4 / 2014-10-17

* Options to show 5th week and last week in monthly recurring UI. [#66](https://github.com/GetJobber/recurring_select/pull/66) (thanks @naomiaro)
Expand Down
84 changes: 42 additions & 42 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
PATH
remote: .
specs:
recurring_select (1.3.0)
recurring_select (2.0.0)
coffee-rails (>= 3.1)
ice_cube (>= 0.11)
jquery-rails (>= 3.0)
rails (>= 3.2)
sass-rails (>= 3.1)
sass-rails (>= 4.0)

GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.10)
actionpack (= 4.0.10)
actionmailer (4.0.13)
actionpack (= 4.0.13)
mail (~> 2.5, >= 2.5.4)
actionpack (4.0.10)
activesupport (= 4.0.10)
actionpack (4.0.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.10)
activesupport (= 4.0.10)
activemodel (4.0.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
activerecord (4.0.10)
activemodel (= 4.0.10)
activerecord (4.0.13)
activemodel (= 4.0.13)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.10)
activesupport (= 4.0.13)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.10)
activerecord-deprecated_finders (1.0.4)
activesupport (4.0.13)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
Expand All @@ -40,42 +40,42 @@ GEM
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.8.0)
coffee-script-source (1.9.1.1)
diff-lcs (1.2.5)
erubis (2.7.0)
execjs (2.2.2)
execjs (2.6.0)
hike (1.2.3)
i18n (0.6.11)
ice_cube (0.12.1)
i18n (0.7.0)
ice_cube (0.13.0)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
mail (2.6.1)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.4.2)
mime-types (2.6.2)
minitest (4.7.5)
multi_json (1.10.1)
multi_json (1.11.2)
pg (0.17.1)
rack (1.5.2)
rack-test (0.6.2)
rack (1.5.5)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.0.10)
actionmailer (= 4.0.10)
actionpack (= 4.0.10)
activerecord (= 4.0.10)
activesupport (= 4.0.10)
rails (4.0.13)
actionmailer (= 4.0.13)
actionpack (= 4.0.13)
activerecord (= 4.0.13)
activesupport (= 4.0.13)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.10)
railties (= 4.0.13)
sprockets-rails (~> 2.0)
railties (4.0.10)
actionpack (= 4.0.10)
activesupport (= 4.0.10)
railties (4.0.13)
actionpack (= 4.0.13)
activesupport (= 4.0.13)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rake (10.4.2)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
Expand All @@ -97,24 +97,24 @@ GEM
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
sass (3.2.19)
sass-rails (4.0.3)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
sprockets (2.11.0)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.0)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
thor (0.19.1)
thread_safe (0.3.4)
thread_safe (0.3.5)
tilt (1.4.1)
tzinfo (0.3.41)
tzinfo (0.3.44)

PLATFORMS
ruby
Expand All @@ -124,9 +124,9 @@ DEPENDENCIES
bundler (>= 1.3.5)
jquery-rails
pg
rails (= 4.0.10)
rails (~> 4.0.12)
rake (>= 0.9.6)
recurring_select!
rspec (>= 2.14)
rspec-rails (>= 2.14)
sass-rails (~> 4.0.3)
sass-rails (~> 4.0.5)
2 changes: 1 addition & 1 deletion lib/recurring_select/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module RecurringSelect
VERSION = "1.3.1"
VERSION = "2.0.0"
end
2 changes: 1 addition & 1 deletion recurring_select.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.add_dependency "rails", ">= 3.2"
s.add_dependency "jquery-rails", ">= 3.0"
s.add_dependency "ice_cube", ">= 0.11"
s.add_dependency "sass-rails", ">= 3.1"
s.add_dependency "sass-rails", ">= 4.0"
s.add_dependency "coffee-rails", ">= 3.1"

s.add_development_dependency "bundler", ">= 1.3.5"
Expand Down
10 changes: 0 additions & 10 deletions spec/gemfiles/Gemfile.rails-3.2.x

This file was deleted.

0 comments on commit 9a33735

Please sign in to comment.