Skip to content
This repository was archived by the owner on Dec 1, 2020. It is now read-only.

Commit 5d7587d

Browse files
committed
Upgrade Rails 5.0.0.beta2
1 parent c54cd5d commit 5d7587d

29 files changed

+398
-232
lines changed

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
# Ignore bundler config.
88
/.bundle
9+
/Dockerfile
10+
/docker-compose.yml
911

1012
# Ignore the default SQLite database.
1113
/db/*.sqlite3
@@ -19,4 +21,4 @@
1921
/public/uploads
2022
tags
2123
*.DS_Store
22-
.idea
24+
.idea

Gemfile

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
source 'https://rubygems.org'
22

33
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4-
gem 'rails', '4.2.5'
4+
gem 'rails', '5.0.0.beta2'
55
# Use postgresql as the database for Active Record
66
gem 'pg'
77
# Use SCSS for stylesheets
8-
gem 'sass-rails', '~> 4.0.3'
8+
gem 'sass-rails'
99
# Use Uglifier as compressor for JavaScript assets
10-
gem 'uglifier', '>= 1.3.0'
10+
gem 'uglifier'
1111
# Use CoffeeScript for .js.coffee assets and views
12-
gem 'coffee-rails', '~> 4.0.0'
12+
gem 'coffee-rails'
1313
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
1414
# gem 'therubyracer', platforms: :ruby
1515

16+
gem 'foreman'
1617
# Use jquery as the JavaScript library
1718
gem 'jquery-rails'
1819
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
@@ -38,24 +39,27 @@ gem 'spring', group: :development
3839
# gem 'debugger', group: [:development, :test]
3940

4041
gem 'rdiscount'
41-
gem 'kaminari'
42+
gem 'kaminari', git: 'git://github.com/amatsuda/kaminari.git'
4243
gem 'carrierwave'
43-
gem 'simple_form', '3.1.0.rc1'
44+
gem 'simple_form'
4445
gem 'nested_form'
4546
gem 'settingslogic'
4647
gem 'rails-i18n'
4748
gem 'rmagick', require: 'RMagick'
4849
gem 'enumerize'
4950
gem 'rack-mini-profiler'
50-
gem 'acts-as-taggable-on'
51+
gem 'acts-as-taggable-on', git: 'https://github.com/mbleigh/acts-as-taggable-on.git'
5152
gem 'select2_helper', git: 'https://github.com/ryudoawaru/select2_helper.git', branch: 'rails42'
5253
gem 'gistyle'
5354
gem 'handlebars_assets'
5455

56+
# for Rails 5.0 upgrade
57+
gem 'record_tag_helper'
58+
5559
# assets
5660
gem 'bootstrap-sass'
5761
gem 'jquery-ui-rails'
58-
gem 'select2-rails'
62+
gem 'select2-rails', '3.5.9.1'
5963
gem 'font-awesome-sass'
6064
gem "jquery-fileupload-rails"
6165

0 commit comments

Comments
 (0)