Skip to content

Commit 70d4144

Browse files
author
Ken Johnson
authored
Merge pull request #371 from jasnow/master
Should fix Issue #370
2 parents df7c4ef + 4297f5b commit 70d4144

File tree

6 files changed

+43
-45
lines changed

6 files changed

+43
-45
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.0-preview1
1+
2.6.5

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: ruby
22
rvm:
3-
- "2.7.0-preview1"
3+
- "2.6.5"
44

55
before_install:
66
- "phantomjs --version"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.7.0-preview1
1+
FROM ruby:2.6.5
22
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
33
RUN mkdir /myapp
44
WORKDIR /myapp

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source "https://rubygems.org"
44
#don't upgrade
55
gem "rails", "6.0.0"
66

7-
ruby "2.7.0"
7+
ruby "2.6.5"
88

99
gem "aruba"
1010
gem "bcrypt"
@@ -52,7 +52,7 @@ group :development, :test, :mysql do
5252
gem "database_cleaner"
5353
gem "launchy"
5454
gem "poltergeist"
55-
gem "rspec-rails", '4.0.0.beta2' # 4/26/2019: LOCKED DOWN
55+
gem "rspec-rails", '4.0.0.beta3' # 4/26/2019: LOCKED DOWN
5656
gem "test-unit"
5757
end
5858

Gemfile.lock

Lines changed: 35 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ GEM
9898
coffee-script-source (1.12.2)
9999
concurrent-ruby (1.1.5)
100100
contracts (0.16.0)
101-
crass (1.0.4)
101+
crass (1.0.5)
102102
cucumber (3.1.2)
103103
builder (>= 2.1.2)
104104
cucumber-core (~> 3.2.0)
@@ -119,22 +119,19 @@ GEM
119119
debug_inspector (0.0.3)
120120
diff-lcs (1.3)
121121
docile (1.3.2)
122-
dotenv (0.7.0)
123122
em-websocket (0.5.1)
124123
eventmachine (>= 0.12.9)
125124
http_parser.rb (~> 0.6.0)
126125
erubi (1.9.0)
127126
eventmachine (1.2.7)
128127
execjs (2.7.0)
129128
ffi (1.11.1)
130-
foreman (0.64.0)
131-
dotenv (~> 0.7.0)
132-
thor (>= 0.13.6)
129+
foreman (0.86.0)
133130
formatador (0.2.5)
134131
gherkin (5.1.0)
135132
globalid (0.4.2)
136133
activesupport (>= 4.2.0)
137-
guard (2.15.1)
134+
guard (2.16.1)
138135
formatador (>= 0.2.4)
139136
listen (>= 2.7, < 4.0)
140137
lumberjack (>= 1.0.12, < 2.0)
@@ -157,9 +154,9 @@ GEM
157154
guard (>= 2.0.0)
158155
guard-compat (~> 1.0)
159156
http_parser.rb (0.6.0)
160-
i18n (1.6.0)
157+
i18n (1.7.0)
161158
concurrent-ruby (~> 1.0)
162-
jaro_winkler (1.5.3)
159+
jaro_winkler (1.5.4)
163160
jquery-fileupload-rails (1.0.0)
164161
actionpack (>= 3.1)
165162
railties (>= 3.1)
@@ -173,11 +170,10 @@ GEM
173170
launchy (2.4.3)
174171
addressable (~> 2.3)
175172
libv8 (3.16.14.19)
176-
listen (3.1.5)
177-
rb-fsevent (~> 0.9, >= 0.9.4)
178-
rb-inotify (~> 0.9, >= 0.9.7)
179-
ruby_dep (~> 1.2)
180-
loofah (2.3.0)
173+
listen (3.2.0)
174+
rb-fsevent (~> 0.10, >= 0.10.3)
175+
rb-inotify (~> 0.9, >= 0.9.10)
176+
loofah (2.3.1)
181177
crass (~> 1.0.2)
182178
nokogiri (>= 1.5.9)
183179
lumberjack (1.0.13)
@@ -189,19 +185,19 @@ GEM
189185
mimemagic (0.3.3)
190186
mini_mime (1.0.2)
191187
mini_portile2 (2.4.0)
192-
minitest (5.12.2)
193-
multi_json (1.13.1)
188+
minitest (5.13.0)
189+
multi_json (1.14.1)
194190
multi_test (0.1.2)
195191
mysql2 (0.5.2)
196192
nenv (0.3.0)
197193
nio4r (2.5.2)
198-
nokogiri (1.10.4)
194+
nokogiri (1.10.5)
199195
mini_portile2 (~> 2.4.0)
200196
notiffany (0.1.3)
201197
nenv (~> 0.1)
202198
shellany (~> 0.0)
203-
parallel (1.17.0)
204-
parser (2.6.4.1)
199+
parallel (1.18.0)
200+
parser (2.6.5.0)
205201
ast (~> 2.4.0)
206202
poltergeist (1.18.1)
207203
capybara (>= 2.1, < 4)
@@ -216,7 +212,7 @@ GEM
216212
pry-rails (0.3.9)
217213
pry (>= 0.10.4)
218214
public_suffix (4.0.1)
219-
puma (4.2.0)
215+
puma (4.2.1)
220216
nio4r (~> 2.0)
221217
rack (2.0.7)
222218
rack-livereload (0.3.17)
@@ -241,8 +237,8 @@ GEM
241237
rails-dom-testing (2.0.3)
242238
activesupport (>= 4.2.0)
243239
nokogiri (>= 1.6)
244-
rails-html-sanitizer (1.2.0)
245-
loofah (~> 2.2, >= 2.2.2)
240+
rails-html-sanitizer (1.3.0)
241+
loofah (~> 2.3)
246242
rails-perftest (0.0.7)
247243
railties (6.0.0)
248244
actionpack (= 6.0.0)
@@ -261,28 +257,28 @@ GEM
261257
responders (3.0.0)
262258
actionpack (>= 5.0)
263259
railties (>= 5.0)
264-
rspec (3.8.0)
265-
rspec-core (~> 3.8.0)
266-
rspec-expectations (~> 3.8.0)
267-
rspec-mocks (~> 3.8.0)
268-
rspec-core (3.8.2)
269-
rspec-support (~> 3.8.0)
270-
rspec-expectations (3.8.4)
260+
rspec (3.9.0)
261+
rspec-core (~> 3.9.0)
262+
rspec-expectations (~> 3.9.0)
263+
rspec-mocks (~> 3.9.0)
264+
rspec-core (3.9.0)
265+
rspec-support (~> 3.9.0)
266+
rspec-expectations (3.9.0)
271267
diff-lcs (>= 1.2.0, < 2.0)
272-
rspec-support (~> 3.8.0)
273-
rspec-mocks (3.8.1)
268+
rspec-support (~> 3.9.0)
269+
rspec-mocks (3.9.0)
274270
diff-lcs (>= 1.2.0, < 2.0)
275-
rspec-support (~> 3.8.0)
276-
rspec-rails (4.0.0.beta2)
271+
rspec-support (~> 3.9.0)
272+
rspec-rails (4.0.0.beta3)
277273
actionpack (>= 4.2)
278274
activesupport (>= 4.2)
279275
railties (>= 4.2)
280276
rspec-core (~> 3.8)
281277
rspec-expectations (~> 3.8)
282278
rspec-mocks (~> 3.8)
283279
rspec-support (~> 3.8)
284-
rspec-support (3.8.2)
285-
rubocop (0.75.0)
280+
rspec-support (3.9.0)
281+
rubocop (0.76.0)
286282
jaro_winkler (~> 1.5.1)
287283
parallel (~> 1.10)
288284
parser (>= 2.6)
@@ -296,7 +292,6 @@ GEM
296292
rubocop (>= 0.68.0)
297293
ruby-prof (1.0.0)
298294
ruby-progressbar (1.10.1)
299-
ruby_dep (1.5.0)
300295
sassc (2.2.1)
301296
ffi (~> 1.9)
302297
sassc-rails (2.1.2)
@@ -311,7 +306,7 @@ GEM
311306
json (>= 1.8, < 3)
312307
simplecov-html (~> 0.10.0)
313308
simplecov-html (0.10.2)
314-
sprockets (3.7.2)
309+
sprockets (4.0.0)
315310
concurrent-ruby (~> 1.0)
316311
rack (> 1, < 3)
317312
sprockets-rails (3.2.1)
@@ -345,7 +340,7 @@ GEM
345340
websocket-extensions (0.1.4)
346341
xpath (3.2.0)
347342
nokogiri (~> 1.8)
348-
zeitwerk (2.1.10)
343+
zeitwerk (2.2.1)
349344

350345
PLATFORMS
351346
ruby
@@ -380,7 +375,7 @@ DEPENDENCIES
380375
rake
381376
rb-fsevent
382377
responders
383-
rspec-rails (= 4.0.0.beta2)
378+
rspec-rails (= 4.0.0.beta3)
384379
rubocop-github
385380
ruby-prof
386381
sassc-rails
@@ -394,7 +389,7 @@ DEPENDENCIES
394389
unicorn
395390

396391
RUBY VERSION
397-
ruby 2.7.0p-1
392+
ruby 2.6.5p114
398393

399394
BUNDLED WITH
400-
2.1.0.pre.1
395+
1.17.3

app/assets/config/manifest.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
//= link_tree ../images
2+
//= link_directory ../javascripts .js
3+
//= link_directory ../stylesheets .css

0 commit comments

Comments
 (0)