Merge branch 'master' into release
Showing
.ruby-gemset
0 → 100644
... | @@ -2,12 +2,13 @@ source 'https://gems.ruby-china.com' | ... | @@ -2,12 +2,13 @@ source 'https://gems.ruby-china.com' |
git_source(:github) { |repo| "https://github.com/#{repo}.git" } | git_source(:github) { |repo| "https://github.com/#{repo}.git" } | ||
ruby '2.6.0' | ruby '2.6.5' | ||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' | # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' | ||
gem 'rails', '~> 5.2.2', '>= 5.2.2.1' | gem 'rails', '~> 6.0.0' | ||
# Use sqlite3 as the database for Active Record | # Use sqlite3 as the database for Active Record | ||
gem 'mysql2', '>= 0.3.18', '< 0.5' | # gem 'sqlite3' | ||
gem 'mysql2', '~> 0.5.3' | |||
# Use Puma as the app server | # Use Puma as the app server | ||
gem 'puma', '~> 3.11' | gem 'puma', '~> 3.11' | ||
# Use SCSS for stylesheets | # Use SCSS for stylesheets | ||
... | @@ -49,13 +50,14 @@ group :development do | ... | @@ -49,13 +50,14 @@ group :development do |
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring | # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring | ||
gem 'spring' | gem 'spring' | ||
gem 'spring-watcher-listen', '~> 2.0.0' | gem 'spring-watcher-listen', '~> 2.0.0' | ||
gem 'capistrano-faster-rails' | |||
# deplopy | # deplopy | ||
gem "capistrano", "~> 3.11", require: false | gem "capistrano", "~> 3.11", require: false | ||
gem 'capistrano-rvm', '~> 0.1.2', require: false | gem 'capistrano-rvm', '~> 0.1.2', require: false | ||
gem 'capistrano-rails', '~> 1.4', require: false | gem 'capistrano-rails', '~> 1.4', require: false | ||
gem 'capistrano3-puma', '~> 3.1', '>= 3.1.1', require: false # https://github.com/seuros/capistrano-puma | gem 'capistrano3-puma', '~> 3.1', '>= 3.1.1', require: false # https://github.com/seuros/capistrano-puma | ||
gem 'capistrano-sidekiq', '~> 1.0', '>= 1.0.2', require: false | gem 'capistrano-sidekiq', '~> 1.0', '>= 1.0.2' | ||
end | end | ||
group :test do | group :test do | ||
... | ... |
This diff is collapsed.
Click to expand it.
app/controllers/user_devices_controller.rb
0 → 100644
app/models/user_device.rb
0 → 100644
app/services/igetui/pusher.rb
0 → 100644
app/services/push.rb
deleted
100644 → 0
app/services/push/igetui.rb
deleted
100644 → 0
app/services/push/igetui/push.rb
deleted
100644 → 0
app/services/push_tool_client.rb
0 → 100644
config/initializers/pusher.rb
0 → 100644
Please
register
or
sign in
to comment