Skip to content
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

Rails6 #13

Open
wants to merge 8 commits into
base: stable
Choose a base branch
from
Open

Rails6 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
88ae400
Add image dragonfly
arvindkushwah9 Oct 30, 2020
9710c34
Update to rails6
arvindkushwah9 Oct 31, 2020
b3aebaa
Server srtart on productoin
arvindkushwah9 Nov 9, 2020
aed8bd5
Server start on staging
arvindkushwah9 Dec 4, 2020
0d5ff11
Set secrets kay
arvindkushwah9 Dec 4, 2020
c240fe3
Fix secrets keys
arvindkushwah9 Dec 5, 2020
5d5aa97
Revert the dev and test keys here
arvindkushwah9 Dec 5, 2020
a62021b
fix missing change of config/deploy.rb ruby version
norbusan Jan 6, 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
11 changes: 10 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,13 @@ pom.xml.asc
/.env

/public/js/out
/public/js/app.js
/public/js/app.js
/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity

# Ignore application configuration
/config/application.yml
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.10
2.7.1
45 changes: 28 additions & 17 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
source 'https://rubygems.org'

gem 'rails', '4.2.11.1'
ruby '2.7.1'
gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
gem 'pg'
gem 'sass-rails', '~> 5.0.2'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'puma', '~> 4.1'
gem 'sass-rails', '>= 6'
gem 'webpacker', '~> 4.0'
gem 'uglifier'#, '>= 1.3.0'
gem 'coffee-rails'#, '~> 4.1.0'
gem 'haml-rails'
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'jquery-ui-rails', '5.0.3'
gem 'turbolinks'
gem 'jbuilder', '~> 2.0'
gem 'delayed_job', '~> 4.0.6'
gem 'delayed_job_active_record', '~> 4.0.3'
gem "highcharts-rails", "~> 3.0.0"
gem 'jbuilder'#, '~> 2.0'
gem 'delayed_job'#, '~> 4.0.6'
gem 'delayed_job_active_record'#, '~> 4.0.3'
gem "highcharts-rails"#, "~> 3.0.0"
gem 'd3_rails'
gem 'c3-rails'
gem 'faye-authentication', github: 'branch14/faye-authentication'
gem 'devise'
gem 'sprockets', '~> 3.0'
gem 'sprockets'#, '~> 3.0'
gem 'mime-types'
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'sqlite3', '~> 1.3.6'

gem 'sdoc', '1.1.0', group: :doc
gem 'sqlite3'#, '~> 1.3.6'
Copy link

Choose a reason for hiding this comment

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

Please pin the versions of the dependencies to the ones which are currently installed. Unpinned dependencies will break application as soon as there is a breaking change

And we don't have any CI build to check if something is breaking or not

# optional
gem 'active_skin'

Expand All @@ -40,11 +42,11 @@ gem 'fog-aws', require: 'fog/aws'
gem 'unicorn'
gem 'activeadmin', github: 'activeadmin/activeadmin'
gem 'rails_config'
gem 'activeadmin-dragonfly', github: 'stefanoverna/activeadmin-dragonfly'
gem 'activeadmin-dragonfly'#, github: 'stefanoverna/activeadmin-dragonfly'
gem 'acts-as-taggable-on'

group :production do
gem 'airbrake', '~> 5.0'
gem 'airbrake'#, '~> 5.0'
end

group :development do
Expand All @@ -56,16 +58,25 @@ group :development do
end

group :development, :test do
gem 'listen', '~> 3.2'
gem 'spring'
gem 'web-console', '~> 2.0'
gem 'web-console'#, '~> 2.0'
gem 'pry-rails'
gem 'byebug'
#gem 'disable_assets_logger'

gem 'database_cleaner'
gem 'rspec-rails'
gem 'rspec_junit_formatter', '0.2.2'
gem 'rspec_junit_formatter'#, '0.2.2'
gem 'spring-commands-rspec' # TODO check if needed
gem 'rack-test'
gem 'factory_girl_rails'
end

gem 'config'
gem 'webpacker', '~> 4.0'
gem 'zeitwerk'
gem 'rake'
gem 'dragonfly'
gem "bourbon"
gem 'figaro'
Loading