Skip to content

Commit 1c845b7

Browse files
committed
mostly working on rails 5.1.7
1 parent 5251c5e commit 1c845b7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+9081
-231
lines changed

.browserslistrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
defaults

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,10 @@ docker/data
5656

5757
*.sublime-workspace
5858
.vscode/
59+
60+
/public/packs
61+
/public/packs-test
62+
/node_modules
63+
/yarn-error.log
64+
yarn-debug.log*
65+
.yarn-integrity

Gemfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
source 'https://rubygems.org'
22

3-
ruby '2.6.5'
3+
ruby '2.6.9'
44

55
# Please keep the gems (as well as within a group) sorted
66
# in alphabetical order.
77

8-
gem 'acts-as-taggable-on', '~> 3.4'
8+
gem 'acts-as-taggable-on', '~> 4.0'
99
gem 'barometer'
1010
gem 'bootstrap-datepicker-rails'
1111
gem 'bootstrap-generators', '~> 3.3.1'
1212
gem 'bootstrap-kaminari-views'
1313
gem 'bourbon', '~> 4.1.1'
1414
gem 'cancancan', '~> 1.10'
15-
gem 'coffee-rails', '~> 4.0.0'
15+
gem 'coffee-rails'
1616
gem 'database_cleaner'
1717
gem 'devise'
1818
gem 'devise-bootstrap-views'
@@ -46,10 +46,11 @@ gem 'puma'
4646
gem 'rake', '< 13.0'
4747
gem 'rack-attack'
4848
gem 'rack-mini-profiler'
49-
gem 'rails', '4.2.11'
49+
gem 'rails', '5.1.7'
50+
gem 'record_tag_helper', '~> 1.0'
5051
gem 'react-rails', '~> 2.3.0'
5152
gem 'recap', '~> 1.0.0'
52-
gem 'redis-rails', '~> 4'
53+
gem 'redis-rails'
5354
gem 'remotipart', '~> 1.2'
5455
gem 'rmagick'
5556
gem 'sass-rails', '~> 5.0.1'
@@ -58,7 +59,8 @@ gem 'sitemap_generator'
5859
gem 'therubyracer'
5960
gem 'twitter-bootstrap-rails'
6061
gem 'uglifier', '>= 1.3.0'
61-
gem 'weather-icons-rails'
62+
# gem 'weather-icons-rails'
63+
gem 'webpacker'
6264
gem 'whenever'
6365
gem 'mimemagic', '~> 0.3.10'
6466

@@ -84,7 +86,7 @@ group :development, :test do
8486
gem 'poltergeist'
8587
gem 'pry'
8688
gem 'rspec-rails'
87-
gem 'spring'
89+
# gem 'spring'
8890
gem 'terminal-notifier-guard'
8991
end
9092

0 commit comments

Comments
 (0)