Skip to content

Commit d185a2d

Browse files
author
mjbellantoni
committedNov 25, 2013
v3.0.0.rc.1
1 parent 20349a7 commit d185a2d

File tree

4 files changed

+48
-65
lines changed

4 files changed

+48
-65
lines changed
 

‎Gemfile.lock

+42-58
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,81 @@
11
PATH
22
remote: .
33
specs:
4-
formtastic-bootstrap (2.1.3)
5-
formtastic (~> 2.2)
4+
formtastic-bootstrap (3.0.0.rc.1)
5+
formtastic (>= 2.2)
66

77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
actionpack (3.2.13)
11-
activemodel (= 3.2.13)
12-
activesupport (= 3.2.13)
13-
builder (~> 3.0.0)
10+
actionpack (4.0.1)
11+
activesupport (= 4.0.1)
12+
builder (~> 3.1.0)
1413
erubis (~> 2.7.0)
15-
journey (~> 1.0.4)
16-
rack (~> 1.4.5)
17-
rack-cache (~> 1.2)
18-
rack-test (~> 0.6.1)
19-
sprockets (~> 2.2.1)
20-
activemodel (3.2.13)
21-
activesupport (= 3.2.13)
22-
builder (~> 3.0.0)
23-
activesupport (3.2.13)
24-
i18n (= 0.6.1)
25-
multi_json (~> 1.0)
14+
rack (~> 1.5.2)
15+
rack-test (~> 0.6.2)
16+
activesupport (4.0.1)
17+
i18n (~> 0.6, >= 0.6.4)
18+
minitest (~> 4.2)
19+
multi_json (~> 1.3)
20+
thread_safe (~> 0.1)
21+
tzinfo (~> 0.3.37)
2622
ammeter (0.2.9)
2723
activesupport (>= 3.0)
2824
railties (>= 3.0)
2925
rspec (>= 2.2)
3026
rspec-rails (>= 2.2)
31-
builder (3.0.4)
32-
diff-lcs (1.1.3)
27+
atomic (1.1.14)
28+
builder (3.1.4)
29+
diff-lcs (1.2.5)
3330
erubis (2.7.0)
3431
formtastic (2.2.1)
3532
actionpack (>= 3.0)
36-
hike (1.2.3)
37-
i18n (0.6.1)
38-
journey (1.0.4)
39-
json (1.8.0)
40-
multi_json (1.7.7)
33+
i18n (0.6.5)
34+
minitest (4.7.5)
35+
multi_json (1.8.2)
4136
nokogiri (1.5.10)
42-
rack (1.4.5)
43-
rack-cache (1.2)
44-
rack (>= 0.4)
45-
rack-ssl (1.3.3)
46-
rack
37+
rack (1.5.2)
4738
rack-test (0.6.2)
4839
rack (>= 1.0)
49-
railties (3.2.13)
50-
actionpack (= 3.2.13)
51-
activesupport (= 3.2.13)
52-
rack-ssl (~> 1.3.2)
40+
railties (4.0.1)
41+
actionpack (= 4.0.1)
42+
activesupport (= 4.0.1)
5343
rake (>= 0.8.7)
54-
rdoc (~> 3.4)
55-
thor (>= 0.14.6, < 2.0)
44+
thor (>= 0.18.1, < 2.0)
5645
rake (10.1.0)
57-
rdoc (3.12.2)
58-
json (~> 1.4)
59-
rspec (2.8.0)
60-
rspec-core (~> 2.8.0)
61-
rspec-expectations (~> 2.8.0)
62-
rspec-mocks (~> 2.8.0)
63-
rspec-core (2.8.0)
64-
rspec-expectations (2.8.0)
65-
diff-lcs (~> 1.1.2)
66-
rspec-mocks (2.8.0)
67-
rspec-rails (2.8.1)
46+
rspec (2.14.1)
47+
rspec-core (~> 2.14.0)
48+
rspec-expectations (~> 2.14.0)
49+
rspec-mocks (~> 2.14.0)
50+
rspec-core (2.14.7)
51+
rspec-expectations (2.14.4)
52+
diff-lcs (>= 1.1.3, < 2.0)
53+
rspec-mocks (2.14.4)
54+
rspec-rails (2.14.0)
6855
actionpack (>= 3.0)
6956
activesupport (>= 3.0)
7057
railties (>= 3.0)
71-
rspec (~> 2.8.0)
58+
rspec-core (~> 2.14.0)
59+
rspec-expectations (~> 2.14.0)
60+
rspec-mocks (~> 2.14.0)
7261
rspec_tag_matchers (1.0.0)
7362
nokogiri (>= 1.4.0)
7463
rspec-rails (>= 1.2.6)
75-
sprockets (2.2.2)
76-
hike (~> 1.2)
77-
multi_json (~> 1.0)
78-
rack (~> 1.0)
79-
tilt (~> 1.1, != 1.3.0)
8064
thor (0.18.1)
81-
tilt (1.4.1)
82-
tzinfo (1.0.1)
65+
thread_safe (0.1.3)
66+
atomic
67+
tzinfo (0.3.38)
8368

8469
PLATFORMS
8570
ruby
8671

8772
DEPENDENCIES
88-
actionpack (~> 3.0)
73+
actionpack
8974
ammeter (~> 0.2.5)
90-
bundler (~> 1.2)
75+
bundler
9176
formtastic-bootstrap!
9277
nokogiri (< 1.6.0)
9378
rake
94-
rspec (~> 2.8.0)
95-
rspec-rails (~> 2.8.0)
79+
rspec-rails
9680
rspec_tag_matchers (>= 1.0.0)
9781
tzinfo

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.3
1+
3.0.0.rc.1

‎formtastic-bootstrap.gemspec

+4-5
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@ Gem::Specification.new do |s|
2424
s.require_paths = ["lib"]
2525
s.rubygems_version = "1.8.10"
2626

27-
s.add_dependency('formtastic', ["~> 2.2"])
27+
s.add_dependency('formtastic', [">= 2.2"])
2828

2929
s.add_development_dependency('rake')
3030
s.add_development_dependency('tzinfo')
31-
s.add_development_dependency('bundler', ["~> 1.2"])
31+
s.add_development_dependency('bundler')
3232
s.add_development_dependency('nokogiri', ["< 1.6.0"])
33-
s.add_development_dependency('rspec', ["~> 2.8.0"])
34-
s.add_development_dependency('rspec-rails', ["~> 2.8.0"])
33+
s.add_development_dependency('rspec-rails')
3534
s.add_development_dependency('rspec_tag_matchers', [">= 1.0.0"])
3635
s.add_development_dependency('ammeter', ["~> 0.2.5"])
37-
s.add_development_dependency('actionpack', ["~> 3.0"])
36+
s.add_development_dependency('actionpack')
3837
end

‎lib/formtastic-bootstrap/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module FormtasticBootstrap
2-
VERSION = "2.1.3"
2+
VERSION = "3.0.0.rc.1"
33
end

0 commit comments

Comments
 (0)