Skip to content

Commit 5cfc405

Browse files
authored
Merge pull request #77 from CDRH/update
bumps rails, other gems to new versions
2 parents 1e9fb73 + 7a63dd2 commit 5cfc405

3 files changed

Lines changed: 85 additions & 77 deletions

File tree

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ end
77

88

99
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
10-
gem 'rails', '~> 5.1.0.rc1'
10+
gem 'rails', '~> 5.1.4'
1111
# Use sqlite3 as the database for Active Record
1212
gem 'sqlite3'
1313
# Use Puma as the app server
14-
gem 'puma', '~> 3.0'
14+
gem 'puma', '~> 3.7'
1515
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
1616
# gem 'jbuilder', '~> 2.5'
1717
# Use Redis adapter to run Action Cable in production
@@ -31,7 +31,7 @@ group :development, :test do
3131
end
3232

3333
group :development do
34-
gem 'listen', '~> 3.0.5'
34+
gem 'listen', '>= 3.0.5', '< 3.2'
3535
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
3636
gem 'spring'
3737
gem 'spring-watcher-listen', '~> 2.0.0'
@@ -42,4 +42,4 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
4242

4343
# using rest-client because I've had far more luck than the
4444
# stlib net/http
45-
gem 'rest-client'
45+
gem 'rest-client', '>= 2.1.0.rc1', '< 2.2'

Gemfile.lock

Lines changed: 80 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,141 +1,149 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.1.0.rc1)
5-
actionpack (= 5.1.0.rc1)
4+
actioncable (5.1.4)
5+
actionpack (= 5.1.4)
66
nio4r (~> 2.0)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.1.0.rc1)
9-
actionpack (= 5.1.0.rc1)
10-
actionview (= 5.1.0.rc1)
11-
activejob (= 5.1.0.rc1)
8+
actionmailer (5.1.4)
9+
actionpack (= 5.1.4)
10+
actionview (= 5.1.4)
11+
activejob (= 5.1.4)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.1.0.rc1)
15-
actionview (= 5.1.0.rc1)
16-
activesupport (= 5.1.0.rc1)
14+
actionpack (5.1.4)
15+
actionview (= 5.1.4)
16+
activesupport (= 5.1.4)
1717
rack (~> 2.0)
18-
rack-test (~> 0.6.3)
18+
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.1.0.rc1)
22-
activesupport (= 5.1.0.rc1)
21+
actionview (5.1.4)
22+
activesupport (= 5.1.4)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.1.0.rc1)
28-
activesupport (= 5.1.0.rc1)
27+
activejob (5.1.4)
28+
activesupport (= 5.1.4)
2929
globalid (>= 0.3.6)
30-
activemodel (5.1.0.rc1)
31-
activesupport (= 5.1.0.rc1)
32-
activerecord (5.1.0.rc1)
33-
activemodel (= 5.1.0.rc1)
34-
activesupport (= 5.1.0.rc1)
30+
activemodel (5.1.4)
31+
activesupport (= 5.1.4)
32+
activerecord (5.1.4)
33+
activemodel (= 5.1.4)
34+
activesupport (= 5.1.4)
3535
arel (~> 8.0)
36-
activesupport (5.1.0.rc1)
36+
activesupport (5.1.4)
3737
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (~> 0.7)
3939
minitest (~> 5.1)
4040
tzinfo (~> 1.1)
4141
arel (8.0.0)
4242
builder (3.2.3)
43-
byebug (9.0.6)
43+
byebug (9.1.0)
4444
concurrent-ruby (1.0.5)
45-
domain_name (0.5.20170223)
45+
crass (1.0.3)
46+
domain_name (0.5.20170404)
4647
unf (>= 0.0.5, < 1.0.0)
47-
erubi (1.6.0)
48+
erubi (1.7.0)
4849
ffi (1.9.18)
49-
globalid (0.3.7)
50-
activesupport (>= 4.1.0)
50+
globalid (0.4.1)
51+
activesupport (>= 4.2.0)
52+
http-accept (1.7.0)
5153
http-cookie (1.0.3)
5254
domain_name (~> 0.5)
53-
i18n (0.8.1)
54-
listen (3.0.8)
55+
i18n (0.9.1)
56+
concurrent-ruby (~> 1.0)
57+
listen (3.1.5)
5558
rb-fsevent (~> 0.9, >= 0.9.4)
5659
rb-inotify (~> 0.9, >= 0.9.7)
57-
loofah (2.0.3)
60+
ruby_dep (~> 1.2)
61+
loofah (2.1.1)
62+
crass (~> 1.0.2)
5863
nokogiri (>= 1.5.9)
59-
mail (2.6.4)
60-
mime-types (>= 1.16, < 4)
61-
method_source (0.8.2)
64+
mail (2.7.0)
65+
mini_mime (>= 0.1.1)
66+
method_source (0.9.0)
6267
mime-types (3.1)
6368
mime-types-data (~> 3.2015)
6469
mime-types-data (3.2016.0521)
65-
mini_portile2 (2.1.0)
66-
minitest (5.10.1)
70+
mini_mime (1.0.0)
71+
mini_portile2 (2.3.0)
72+
minitest (5.11.1)
6773
netrc (0.11.0)
68-
nio4r (2.0.0)
69-
nokogiri (1.7.1)
70-
mini_portile2 (~> 2.1.0)
71-
puma (3.8.2)
72-
rack (2.0.1)
73-
rack-test (0.6.3)
74-
rack (>= 1.0)
75-
rails (5.1.0.rc1)
76-
actioncable (= 5.1.0.rc1)
77-
actionmailer (= 5.1.0.rc1)
78-
actionpack (= 5.1.0.rc1)
79-
actionview (= 5.1.0.rc1)
80-
activejob (= 5.1.0.rc1)
81-
activemodel (= 5.1.0.rc1)
82-
activerecord (= 5.1.0.rc1)
83-
activesupport (= 5.1.0.rc1)
84-
bundler (>= 1.3.0, < 2.0)
85-
railties (= 5.1.0.rc1)
74+
nio4r (2.2.0)
75+
nokogiri (1.8.1)
76+
mini_portile2 (~> 2.3.0)
77+
puma (3.11.0)
78+
rack (2.0.3)
79+
rack-test (0.8.2)
80+
rack (>= 1.0, < 3)
81+
rails (5.1.4)
82+
actioncable (= 5.1.4)
83+
actionmailer (= 5.1.4)
84+
actionpack (= 5.1.4)
85+
actionview (= 5.1.4)
86+
activejob (= 5.1.4)
87+
activemodel (= 5.1.4)
88+
activerecord (= 5.1.4)
89+
activesupport (= 5.1.4)
90+
bundler (>= 1.3.0)
91+
railties (= 5.1.4)
8692
sprockets-rails (>= 2.0.0)
87-
rails-dom-testing (2.0.2)
88-
activesupport (>= 4.2.0, < 6.0)
89-
nokogiri (~> 1.6)
93+
rails-dom-testing (2.0.3)
94+
activesupport (>= 4.2.0)
95+
nokogiri (>= 1.6)
9096
rails-html-sanitizer (1.0.3)
9197
loofah (~> 2.0)
92-
railties (5.1.0.rc1)
93-
actionpack (= 5.1.0.rc1)
94-
activesupport (= 5.1.0.rc1)
98+
railties (5.1.4)
99+
actionpack (= 5.1.4)
100+
activesupport (= 5.1.4)
95101
method_source
96102
rake (>= 0.8.7)
97103
thor (>= 0.18.1, < 2.0)
98-
rake (12.0.0)
99-
rb-fsevent (0.9.8)
100-
rb-inotify (0.9.8)
101-
ffi (>= 0.5.0)
102-
rest-client (2.0.1)
104+
rake (12.3.0)
105+
rb-fsevent (0.10.2)
106+
rb-inotify (0.9.10)
107+
ffi (>= 0.5.0, < 2)
108+
rest-client (2.1.0.rc1)
109+
http-accept (>= 1.7.0, < 2.0)
103110
http-cookie (>= 1.0.2, < 2.0)
104111
mime-types (>= 1.16, < 4.0)
105112
netrc (~> 0.8)
106-
spring (2.0.1)
113+
ruby_dep (1.5.0)
114+
spring (2.0.2)
107115
activesupport (>= 4.2)
108116
spring-watcher-listen (2.0.1)
109117
listen (>= 2.7, < 4.0)
110118
spring (>= 1.2, < 3.0)
111119
sprockets (3.7.1)
112120
concurrent-ruby (~> 1.0)
113121
rack (> 1, < 3)
114-
sprockets-rails (3.2.0)
122+
sprockets-rails (3.2.1)
115123
actionpack (>= 4.0)
116124
activesupport (>= 4.0)
117125
sprockets (>= 3.0.0)
118126
sqlite3 (1.3.13)
119-
thor (0.19.4)
127+
thor (0.20.0)
120128
thread_safe (0.3.6)
121-
tzinfo (1.2.2)
129+
tzinfo (1.2.4)
122130
thread_safe (~> 0.1)
123131
unf (0.1.4)
124132
unf_ext
125-
unf_ext (0.0.7.2)
133+
unf_ext (0.0.7.4)
126134
websocket-driver (0.6.5)
127135
websocket-extensions (>= 0.1.0)
128-
websocket-extensions (0.1.2)
136+
websocket-extensions (0.1.3)
129137

130138
PLATFORMS
131139
ruby
132140

133141
DEPENDENCIES
134142
byebug
135-
listen (~> 3.0.5)
136-
puma (~> 3.0)
137-
rails (~> 5.1.0.rc1)
138-
rest-client
143+
listen (>= 3.0.5, < 3.2)
144+
puma (~> 3.7)
145+
rails (~> 5.1.4)
146+
rest-client (>= 2.1.0.rc1, < 2.2)
139147
spring
140148
spring-watcher-listen (~> 2.0.0)
141149
sqlite3

config/config.example.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ default: &default
77
documentation: "https://cdrhapi.unl.edu/docs"
88
license: "TODO"
99
terms_of_service: "TODO"
10-
version: 0.1.0
10+
version: 1.0.0
1111

1212
settings:
1313
# regex for (encoded) characters separating filters: |

0 commit comments

Comments
 (0)