From 5746ae80aa1408ce8dd7d7116ec18b641b626531 Mon Sep 17 00:00:00 2001 From: Ziyi Date: Wed, 17 Feb 2021 12:44:25 -0800 Subject: [PATCH 1/4] gitignore for Mac --- .gitignore | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/.gitignore b/.gitignore index ee9739f8..f35f94d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,23 @@ +# Global, for Macs +*~ + +# Compiled Python files +*.pyc + +# Folder view configuration files +.DS_Store +Desktop.ini + +# Thumbnail cache files +._* +Thumbs.db + +# Files that might appear on external disks +.Spotlight-V100 +.Trashes + + +# Legacy from before Feb 2021 /db/test.sqlite3-journal config/application.rb config/config.yml @@ -41,3 +61,62 @@ docker-compose.override.yml osem_development osem_test config/local_env.yml + +# From GitHub, for Ruby +# https://github.com/github/gitignore/blob/master/Ruby.gitignore +*.gem +*.rbc +/.config +/coverage/ +/InstalledFiles +/pkg/ +/spec/reports/ +/spec/examples.txt +/test/tmp/ +/test/version_tmp/ +/tmp/ + +# Used by dotenv library to load environment variables. +# .env + +# Ignore Byebug command history file. +.byebug_history + +## Specific to RubyMotion: +.dat* +.repl_history +build/ +*.bridgesupport +build-iPhoneOS/ +build-iPhoneSimulator/ + +## Specific to RubyMotion (use of CocoaPods): +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# +# vendor/Pods/ + +## Documentation cache and generated files: +/.yardoc/ +/_yardoc/ +/doc/ +/rdoc/ + +## Environment normalization: +/.bundle/ +/vendor/bundle +/lib/bundler/man/ + +# for a library or gem, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# Gemfile.lock +# .ruby-version +# .ruby-gemset + +# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: +.rvmrc + +# Used by RuboCop. Remote config files pulled in from inherit_from directive. +.rubocop-https?--* From 8c1a8108c20cbe9a3f0b2ca52f8c5ce07e88748c Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Wed, 17 Feb 2021 17:17:30 -0800 Subject: [PATCH 2/4] Create info.yml --- info.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 info.yml diff --git a/info.yml b/info.yml new file mode 100644 index 00000000..1a5487d0 --- /dev/null +++ b/info.yml @@ -0,0 +1,44 @@ +project: + name: 'snapcon' + owner: 'cs169' + teamId: '5' + identities: + pivotal: + url: 'https://www.pivotaltracker.com/n/projects/2487653' + heroku: + url: 'https://http://cs169l-sp2021-snapcon.herokuapp.com' + travis: + url: 'https://travis-ci.com/github/CactusPuppy/snapcon' + codeclimate: + url: 'https://codeclimate.com/github/CactusPuppy/snapcon' + members: + member1: + name: 'Rajavi' + surname: 'Mishra' + githubUsername: 'rajavi-mishra' + pivotalUsername: 'rajavimishra' + herokuEmail: 'rajavi.mishra@berkeley.edu' + member2: + name: 'Jimmy' + surname: 'Xu' + githubUsername: 'kingdish' + pivotalUsername: 'kingdish' + herokuEmail: 'jimmyxu1997@berkeley.edu' + member3: + name: 'Coby' + surname: 'Zhong' + githubUsername: 'CactusPuppy' + pivotalUsername: 'cobyzhong' + herokuEmail: 'coby.zhong@berkeley.edu' + member4: + name: 'Esha' + surname: 'Madhekare' + githubUsername: 'madhekare' + pivotalUsername: 'eshamadhekar' + herokuEmail: 'esha@berkeley.edu' + member5: + name: 'Ziyi' + surname: 'Lu' + githubUsername: 'lzy-106' + pivotalUsername: 'lzy_1006' + herokuEmail: 'lzy-1006@berkeley.edu' From c007bcf4c6053e8c18c97e3e2f1b22d625a37012 Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Wed, 17 Feb 2021 17:21:02 -0800 Subject: [PATCH 3/4] Update info.yml --- info.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/info.yml b/info.yml index 1a5487d0..1affa50a 100644 --- a/info.yml +++ b/info.yml @@ -13,32 +13,8 @@ project: url: 'https://codeclimate.com/github/CactusPuppy/snapcon' members: member1: - name: 'Rajavi' - surname: 'Mishra' - githubUsername: 'rajavi-mishra' - pivotalUsername: 'rajavimishra' - herokuEmail: 'rajavi.mishra@berkeley.edu' - member2: - name: 'Jimmy' - surname: 'Xu' - githubUsername: 'kingdish' - pivotalUsername: 'kingdish' - herokuEmail: 'jimmyxu1997@berkeley.edu' - member3: name: 'Coby' surname: 'Zhong' githubUsername: 'CactusPuppy' pivotalUsername: 'cobyzhong' herokuEmail: 'coby.zhong@berkeley.edu' - member4: - name: 'Esha' - surname: 'Madhekare' - githubUsername: 'madhekare' - pivotalUsername: 'eshamadhekar' - herokuEmail: 'esha@berkeley.edu' - member5: - name: 'Ziyi' - surname: 'Lu' - githubUsername: 'lzy-106' - pivotalUsername: 'lzy_1006' - herokuEmail: 'lzy-1006@berkeley.edu' From 9ed6210319ced319ba2edef61383af37f0e4cfcb Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Wed, 17 Feb 2021 17:47:35 -0800 Subject: [PATCH 4/4] Remove double HTTP from app URL --- info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.yml b/info.yml index 1affa50a..ab0afd5e 100644 --- a/info.yml +++ b/info.yml @@ -6,7 +6,7 @@ project: pivotal: url: 'https://www.pivotaltracker.com/n/projects/2487653' heroku: - url: 'https://http://cs169l-sp2021-snapcon.herokuapp.com' + url: 'https://cs169l-sp2021-snapcon.herokuapp.com' travis: url: 'https://travis-ci.com/github/CactusPuppy/snapcon' codeclimate: