Skip to content

Commit be321bf

Browse files
committed
Initial modification for Rails 5
1 parent 307ef7d commit be321bf

Some content is hidden

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

54 files changed

+875
-759
lines changed

Gemfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22

33
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4-
gem 'rails', '~> 4.2.0'
4+
gem 'rails', '>= 5.0', '< 5.1'
55

66
# Use mysql2 as the database for Active Record
77
# USE THIS VERSION for 4.1
@@ -10,13 +10,13 @@ gem 'rails', '~> 4.2.0'
1010
gem 'mysql2', '~> 0.3.18'
1111

1212
# Use SCSS for stylesheets
13-
gem 'sass-rails', '~> 4.0.0'
13+
gem 'sass-rails'#, '~> 4.0.0'
1414

1515
# Use Uglifier as compressor for JavaScript assets
1616
gem 'uglifier', '>= 1.3.0'
1717

1818
# Use CoffeeScript for .js.coffee assets and views
19-
gem 'coffee-rails', '~> 4.0.0'
19+
gem 'coffee-rails'#, '~> 4.2'
2020

2121
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
2222
#gem 'therubyracer', platforms: :ruby
@@ -81,13 +81,13 @@ group :development do
8181
gem 'webrick', '~> 1.3.1'
8282
end
8383

84-
gem 'blacklight', "~> 5.14"
84+
gem 'blacklight'
8585
gem "blacklight_advanced_search"
86-
gem 'bootstrap-sass', "3.3.4.1"
86+
gem 'bootstrap-sass'
8787
# For nice date ranges
8888
#https://github.com/projectblacklight/blacklight_range_limit
89-
gem "blacklight_range_limit", git: 'https://github.com/rism-ch/blacklight_range_limit', branch: "jquery3"
90-
gem 'devise', "~> 3.5.6"
89+
#gem "blacklight_range_limit", git: 'https://github.com/rism-ch/blacklight_range_limit', branch: "jquery3"
90+
gem 'devise'
9191
gem 'devise-i18n'
9292

9393
# paperclip for image storage
@@ -119,7 +119,7 @@ gem "i18n-js", ">= 3.0.0.rc11"
119119
gem 'colorize'
120120

121121
gem "rspec"
122-
gem 'rspec-rails', '~> 3.5'
122+
gem 'rspec-rails'#, '~> 3.5'
123123
gem 'factory_girl_rails'
124124
gem 'poltergeist', "1.11.0"
125125
gem 'database_cleaner'
@@ -131,4 +131,4 @@ gem 'chart-js-rails'
131131
gem 'osullivan'
132132

133133
## Add translations for activerecord and co
134-
gem 'rails-i18n', github: 'svenfuchs/rails-i18n', branch: 'rails-4-x' # For 4.x
134+
gem 'rails-i18n'#, github: 'svenfuchs/rails-i18n', branch: 'rails-4-x' # For 4.x

0 commit comments

Comments
 (0)