From 079b367d563ee0dd9a4fccf1454a2b38bb79ac16 Mon Sep 17 00:00:00 2001 From: Kevin Mulhern Date: Sat, 18 Jun 2022 01:01:13 +0100 Subject: [PATCH] Chore: Update Top Level App files to be inline with latest Rails Apps Because: * It helps with upgrades and avoiding bugs. This commit: * Update .gitignore file to be inline with recent rails apps * Update config.ru file to latest syntax. * Update Rakefile to latest syntax. * Add .gitattributes which is included in latest Rails apps. * Remove dump.rdb file --- .gitattributes | 10 ++++++++ .gitignore | 66 +++++++++++-------------------------------------- Rakefile | 3 +-- config.ru | 4 ++- dump.rdb | Bin 564 -> 0 bytes 5 files changed, 28 insertions(+), 55 deletions(-) create mode 100644 .gitattributes delete mode 100644 dump.rdb diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..516857104d --- /dev/null +++ b/.gitattributes @@ -0,0 +1,10 @@ +# See https://git-scm.com/docs/gitattributes for more about git attribute files. + +# Mark the database schema as having been generated. +db/schema.rb linguist-generated + +# Mark the yarn lockfile as having been generated. +yarn.lock linguist-generated + +# Mark any vendored files as having been vendored. +vendor/* linguist-vendored diff --git a/.gitignore b/.gitignore index fbd99f589f..ea689d72f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,15 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. +# See https://help.github.com/articles/ignoring-files for more about ignoring files. # # If you find yourself ignoring temporary files generated by your text editor # or operating system, you probably want to add a global ignore instead: -# git config --global core.excludesfile '~/.gitignore_global' +# git config --global core.excludesfile '~/.gitignore_global' # Ignore bundler config. /.bundle # Ignore the default SQLite database. /db/*.sqlite3 -/db/*.sqlite3-journal - - -# Ignore any assets that may have been precompiled locally -# e.g. to test run the production environment locally -/public/assets +/db/*.sqlite3-* # Ignore all logfiles and tempfiles. /log/* @@ -27,57 +22,24 @@ !/tmp/pids/ !/tmp/pids/.keep -# scm revert files -**.orig - -# Mac finder artifacts -.DS_Store - -# Netbeans project directory -/nbproject/ +# Ignore uploaded files in development. +/storage/* +!/storage/.keep -# RubyMine project files -.idea -/.idea/* - -# Textmate project files -/*.tmproj +/public/assets +.byebug_history -# vim artifacts -**.swp +# Ignore master key for decrypting credentials and more. +/config/master.key -# VS Code artifacts -/.vscode +# Mac finder artifacts +.DS_Store -# Ignore application configuration -/config/application.yml -/config/database.yml +# Ignore env files. .env* -# secret token -.secret -config/secrets.yml - -# additional -.project -*~ - -# from Github Rails.gitignore -*.rbc -*.sassc -.sass-cache -capybara-*.html -.rspec -/public/system +# Ignore test coverage reports. /coverage/ -/spec/tmp -rerun.txt -pickle-email-*.html -/vendor/bundle -======= -# Versioning -.rvmrc -.tool-versions /public/packs /public/packs-test diff --git a/Rakefile b/Rakefile index a68319b8d9..e85f913914 100755 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,6 @@ -#!/usr/bin/env rake # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. -require File.expand_path('config/application', __dir__) +require_relative 'config/application' Rails.application.load_tasks diff --git a/config.ru b/config.ru index 9797be5aed..ad1fbf295b 100644 --- a/config.ru +++ b/config.ru @@ -1,4 +1,6 @@ # This file is used by Rack-based servers to start the application. -require ::File.expand_path('config/environment', __dir__) +require_relative 'config/environment' + run Rails.application +Rails.application.load_server diff --git a/dump.rdb b/dump.rdb deleted file mode 100644 index b9ccc1abe88c69eed19c68cc1de595cc9ddf8cba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 564 zcmXYuKX21O9EQ(sLjErGXagtO0g=gWW`paTpU!hiswa<+elprirYL4qm^ z9{{nUE_?wb6w1I>6)_<(Gr9qV?+_$PDP3PZuk^lpdYjj8+@h4KMJa}`pERFAoaZgt zl8f^H!0)HYzPHE+X@3X@FRyI)i{dzeusMX`!THO}XtAtEQS(U*dgu>eAN@hUO?0;U zbPQu?hY;!UAT>UB-d*dgc9syjV|niF4c8N+G#w7 z2GQ}ugtYGohu&|HV4xFRJx6ZCAQ%l{bEx}+n{y;CN&T;g(Kux*{CmN-8bZV#20Eum(wB8^11Y9p8&ddxv=4ykM$9zzgu*ax@y* z((-&Ax9|&tOz=gt{oqqp=@l%;W|LpuG+Un=Ok|hlHBhcEDd*Y}I$$gcG!IaIHK3m^2Z7vS$yEPEXc5O#f<~SMxE06(ap|Y~dUQS3R z_}cE0Weagwd6c2m9CP^O!)&8#+Lp@d)0$*j3gP%*vq&(ixR#F660+*FWGmUCObNwj s)qe#Sf1Md!(^BqirJJE1a@UH+