Skip to content

David dual boot #1104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

David dual boot #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75fb42c
Prepare Gemfiles for dual-booting
davidwessman Oct 9, 2021
2819989
Update syntax in factories
davidwessman Oct 9, 2021
3d64574
Remove local from wice_grid_
davidwessman Oct 9, 2021
a0d1f42
ToolRenting: Proper user association
davidwessman Oct 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
def next?
File.basename(__FILE__) == "Gemfile.next"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.

end

source 'https://rubygems.org'

# Do not forget to update in .ruby-version, Capfile and circle.yml
ruby '2.5.0'

gem 'rails', '5.1.6.2'
if next?
gem 'rails', '~> 5.2'
else
gem 'rails', '5.1.6.2'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bundler/DuplicatedGem: Gem rails requirements already given on line 11 of the Gemfile.

end

gem 'sprockets', '~> 3.7'
gem 'active_model_serializers', '~> 0.10.0'
gem 'bcrypt_pbkdf', '~> 1.1.0.rc1'
gem 'bootstrap-sass'
Expand All @@ -30,7 +39,7 @@ gem 'icalendar'
gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'jquery-ui-rails'
gem 'kaminari'
gem 'kaminari', '~>1.1'
gem 'meta-tags'
gem 'mail', '>= 2.6.6.rc1'
gem 'mini_magick'
Expand All @@ -57,15 +66,14 @@ gem 'simple_form'
gem 'sitemap_generator'
gem 'turbolinks'
gem 'uglifier'
gem 'wice_grid', git: 'https://github.com/navro/wice_grid', branch: 'rails51'
gem 'wice_grid', git: 'https://github.com/patricklindsay/wice_grid'

# To have a working JVM on server
group :staging, :production do
gem 'therubyracer', platform: :ruby
end

group :development, :test do
gem 'better_errors', git: 'https://github.com/charliesome/better_errors' # For rails 5 support
gem 'capistrano', require: false
# Need 1.1.3 to load sprockets manifest file
gem 'capistrano-rails', require: false
Expand Down
65 changes: 32 additions & 33 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
GIT
remote: https://github.com/charliesome/better_errors
revision: 946281d441523c9a009657a1c658f5134c17b482
specs:
better_errors (2.4.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)

GIT
remote: https://github.com/globalize/globalize
revision: 2ae107f750ed3448d9dda70e15676a61820ce53b
Expand All @@ -25,14 +16,13 @@ GIT
mime-types (~> 2.3)

GIT
remote: https://github.com/navro/wice_grid
revision: bd833172557e41ac770c937142d772c4025157b8
branch: rails51
remote: https://github.com/patricklindsay/wice_grid
revision: 39e301c349bff5db271dec3222c5ca91d4bfcbd4
specs:
wice_grid (4.0.1)
wice_grid (4.1.0)
coffee-rails (> 3.2)
kaminari (~> 0.16)
rails (~> 5.0, < 5.2)
kaminari (~> 1.1)
rails (~> 5.0, < 5.3)

GIT
remote: https://github.com/zpaulovics/datetimepicker-rails
Expand Down Expand Up @@ -108,7 +98,7 @@ GEM
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
builder (3.2.3)
builder (3.2.4)
bullet (5.7.5)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11.0)
Expand Down Expand Up @@ -156,11 +146,11 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.9)
connection_pool (2.2.1)
cookies_eu (1.7.1)
js_cookie_rails (~> 2.2.0)
crass (1.0.5)
crass (1.0.6)
css_parser (1.6.0)
addressable
database_cleaner (1.7.0)
Expand All @@ -184,7 +174,7 @@ GEM
railties (>= 3.2, < 6.0)
ed25519 (1.2.4)
ejs (1.1.1)
erubi (1.9.0)
erubi (1.10.0)
et-orbi (1.1.0)
tzinfo
execjs (2.7.0)
Expand All @@ -211,7 +201,7 @@ GEM
http-2 (0.8.4)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (1.7.0)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
jquery-rails (4.3.3)
Expand All @@ -227,15 +217,24 @@ GEM
railties (>= 3.1)
json (2.1.0)
jsonapi-renderer (0.1.2)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
actionview
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
activerecord
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
libv8 (3.16.14.19)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.3.1)
loofah (2.12.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -249,8 +248,8 @@ GEM
rake
mini_magick (4.9.5)
mini_mime (1.0.1)
mini_portile2 (2.5.1)
minitest (5.13.0)
mini_portile2 (2.6.1)
minitest (5.14.4)
momentjs-rails (2.20.1)
railties (>= 3.1)
multi_json (1.13.1)
Expand All @@ -263,8 +262,8 @@ GEM
net-ssh (5.2.0)
netrc (0.11.0)
nio4r (2.3.1)
nokogiri (1.11.4)
mini_portile2 (~> 2.5.0)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
racc (~> 1.4)
onesky-rails (1.4.0)
i18n (>= 0.5.0)
Expand Down Expand Up @@ -308,7 +307,7 @@ GEM
public_suffix (4.0.6)
puma (3.11.4)
racc (1.5.2)
rack (2.0.7)
rack (2.2.3)
rack-protection (2.0.1)
rack
rack-test (1.1.0)
Expand All @@ -332,7 +331,7 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (5.1.6.2)
actionpack (= 5.1.6.2)
Expand Down Expand Up @@ -457,7 +456,7 @@ GEM
turbolinks (5.1.1)
turbolinks-source (~> 5.1)
turbolinks-source (5.1.0)
tzinfo (1.2.5)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (4.1.11)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -485,7 +484,6 @@ DEPENDENCIES
active_model_serializers (~> 0.10.0)
activemodel-serializers-xml
bcrypt_pbkdf (~> 1.1.0.rc1)
better_errors!
bootstrap-datepicker-rails
bootstrap-sass
bullet
Expand Down Expand Up @@ -517,7 +515,7 @@ DEPENDENCIES
jquery-rails
jquery-turbolinks
jquery-ui-rails
kaminari
kaminari (~> 1.1)
listen
mail (>= 2.6.6.rc1)
meta-tags
Expand Down Expand Up @@ -554,6 +552,7 @@ DEPENDENCIES
sidekiq-unique-jobs
simple_form
sitemap_generator
sprockets (~> 3.7)
therubyracer
turbolinks
uglifier
Expand Down
1 change: 1 addition & 0 deletions Gemfile.next
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Gemfile
Loading