Skip to content

Commit 9a33735

Browse files
committed
Merge pull request #86 from GetJobber/rename_all_scss
renaming all the .css.scsses
2 parents 366cfd3 + cc89ef6 commit 9a33735

File tree

9 files changed

+49
-55
lines changed

9 files changed

+49
-55
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ rvm:
88
- 2.2.0
99
- jruby-19mode
1010
gemfile:
11-
- spec/gemfiles/Gemfile.rails-3.2.x
1211
- spec/gemfiles/Gemfile.rails-4.0.x
1312
- spec/gemfiles/Gemfile.rails-4.1.x
1413
- spec/gemfiles/Gemfile.rails-4.2.x

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 2.0.0 / 2015-09-24
2+
3+
* [BREAKING-CHANGE] Dropping support for rails 3.X - Upgrade to sass-rails 4
4+
* [FIX] Rename all css.scss to .scss [#86](https://github.com/GetJobber/recurring_select/pull/86)
5+
16
# 1.2.4 / 2014-10-17
27

38
* Options to show 5th week and last week in monthly recurring UI. [#66](https://github.com/GetJobber/recurring_select/pull/66) (thanks @naomiaro)

Gemfile.lock

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
PATH
22
remote: .
33
specs:
4-
recurring_select (1.3.0)
4+
recurring_select (2.0.0)
55
coffee-rails (>= 3.1)
66
ice_cube (>= 0.11)
77
jquery-rails (>= 3.0)
88
rails (>= 3.2)
9-
sass-rails (>= 3.1)
9+
sass-rails (>= 4.0)
1010

1111
GEM
1212
remote: https://rubygems.org/
1313
specs:
14-
actionmailer (4.0.10)
15-
actionpack (= 4.0.10)
14+
actionmailer (4.0.13)
15+
actionpack (= 4.0.13)
1616
mail (~> 2.5, >= 2.5.4)
17-
actionpack (4.0.10)
18-
activesupport (= 4.0.10)
17+
actionpack (4.0.13)
18+
activesupport (= 4.0.13)
1919
builder (~> 3.1.0)
2020
erubis (~> 2.7.0)
2121
rack (~> 1.5.2)
2222
rack-test (~> 0.6.2)
23-
activemodel (4.0.10)
24-
activesupport (= 4.0.10)
23+
activemodel (4.0.13)
24+
activesupport (= 4.0.13)
2525
builder (~> 3.1.0)
26-
activerecord (4.0.10)
27-
activemodel (= 4.0.10)
26+
activerecord (4.0.13)
27+
activemodel (= 4.0.13)
2828
activerecord-deprecated_finders (~> 1.0.2)
29-
activesupport (= 4.0.10)
29+
activesupport (= 4.0.13)
3030
arel (~> 4.0.0)
31-
activerecord-deprecated_finders (1.0.3)
32-
activesupport (4.0.10)
31+
activerecord-deprecated_finders (1.0.4)
32+
activesupport (4.0.13)
3333
i18n (~> 0.6, >= 0.6.9)
3434
minitest (~> 4.2)
3535
multi_json (~> 1.3)
@@ -40,42 +40,42 @@ GEM
4040
coffee-rails (4.1.0)
4141
coffee-script (>= 2.2.0)
4242
railties (>= 4.0.0, < 5.0)
43-
coffee-script (2.3.0)
43+
coffee-script (2.4.1)
4444
coffee-script-source
4545
execjs
46-
coffee-script-source (1.8.0)
46+
coffee-script-source (1.9.1.1)
4747
diff-lcs (1.2.5)
4848
erubis (2.7.0)
49-
execjs (2.2.2)
49+
execjs (2.6.0)
5050
hike (1.2.3)
51-
i18n (0.6.11)
52-
ice_cube (0.12.1)
51+
i18n (0.7.0)
52+
ice_cube (0.13.0)
5353
jquery-rails (3.1.2)
5454
railties (>= 3.0, < 5.0)
5555
thor (>= 0.14, < 2.0)
56-
mail (2.6.1)
56+
mail (2.6.3)
5757
mime-types (>= 1.16, < 3)
58-
mime-types (2.4.2)
58+
mime-types (2.6.2)
5959
minitest (4.7.5)
60-
multi_json (1.10.1)
60+
multi_json (1.11.2)
6161
pg (0.17.1)
62-
rack (1.5.2)
63-
rack-test (0.6.2)
62+
rack (1.5.5)
63+
rack-test (0.6.3)
6464
rack (>= 1.0)
65-
rails (4.0.10)
66-
actionmailer (= 4.0.10)
67-
actionpack (= 4.0.10)
68-
activerecord (= 4.0.10)
69-
activesupport (= 4.0.10)
65+
rails (4.0.13)
66+
actionmailer (= 4.0.13)
67+
actionpack (= 4.0.13)
68+
activerecord (= 4.0.13)
69+
activesupport (= 4.0.13)
7070
bundler (>= 1.3.0, < 2.0)
71-
railties (= 4.0.10)
71+
railties (= 4.0.13)
7272
sprockets-rails (~> 2.0)
73-
railties (4.0.10)
74-
actionpack (= 4.0.10)
75-
activesupport (= 4.0.10)
73+
railties (4.0.13)
74+
actionpack (= 4.0.13)
75+
activesupport (= 4.0.13)
7676
rake (>= 0.8.7)
7777
thor (>= 0.18.1, < 2.0)
78-
rake (10.3.2)
78+
rake (10.4.2)
7979
rspec (3.1.0)
8080
rspec-core (~> 3.1.0)
8181
rspec-expectations (~> 3.1.0)
@@ -97,24 +97,24 @@ GEM
9797
rspec-support (~> 3.1.0)
9898
rspec-support (3.1.2)
9999
sass (3.2.19)
100-
sass-rails (4.0.3)
100+
sass-rails (4.0.5)
101101
railties (>= 4.0.0, < 5.0)
102-
sass (~> 3.2.0)
103-
sprockets (~> 2.8, <= 2.11.0)
102+
sass (~> 3.2.2)
103+
sprockets (~> 2.8, < 3.0)
104104
sprockets-rails (~> 2.0)
105-
sprockets (2.11.0)
105+
sprockets (2.12.4)
106106
hike (~> 1.2)
107107
multi_json (~> 1.0)
108108
rack (~> 1.0)
109109
tilt (~> 1.1, != 1.3.0)
110-
sprockets-rails (2.2.0)
110+
sprockets-rails (2.3.3)
111111
actionpack (>= 3.0)
112112
activesupport (>= 3.0)
113113
sprockets (>= 2.8, < 4.0)
114114
thor (0.19.1)
115-
thread_safe (0.3.4)
115+
thread_safe (0.3.5)
116116
tilt (1.4.1)
117-
tzinfo (0.3.41)
117+
tzinfo (0.3.44)
118118

119119
PLATFORMS
120120
ruby
@@ -124,9 +124,9 @@ DEPENDENCIES
124124
bundler (>= 1.3.5)
125125
jquery-rails
126126
pg
127-
rails (= 4.0.10)
127+
rails (~> 4.0.12)
128128
rake (>= 0.9.6)
129129
recurring_select!
130130
rspec (>= 2.14)
131131
rspec-rails (>= 2.14)
132-
sass-rails (~> 4.0.3)
132+
sass-rails (~> 4.0.5)
File renamed without changes.
File renamed without changes.

lib/recurring_select/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module RecurringSelect
2-
VERSION = "1.3.1"
2+
VERSION = "2.0.0"
33
end

recurring_select.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
1919
s.add_dependency "rails", ">= 3.2"
2020
s.add_dependency "jquery-rails", ">= 3.0"
2121
s.add_dependency "ice_cube", ">= 0.11"
22-
s.add_dependency "sass-rails", ">= 3.1"
22+
s.add_dependency "sass-rails", ">= 4.0"
2323
s.add_dependency "coffee-rails", ">= 3.1"
2424

2525
s.add_development_dependency "bundler", ">= 1.3.5"
File renamed without changes.

spec/gemfiles/Gemfile.rails-3.2.x

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)