Code

Staging#234

Code

Open

awhicks wants to merge 64 commits intomasterweb-cat/code-workout:masterfrom stagingweb-cat/code-workout:stagingCopy head branch name to clipboard

+2,067-1,376

Commits

Commits on Jun 3, 2020

• First steps for rails 5.

  Show description for 931798a
  ayaankazerouni

  committed
  931798a

  Copy full SHA for 931798a

• Fix exercise-related active-record queries

  Show description for 72a7506
  ayaankazerouni

  committed
  72a7506

  Copy full SHA for 72a7506

• Use SQL instead of ActiveRecord hashes

  Show description for 2e81b94
  ayaankazerouni

  committed
  2e81b94

  Copy full SHA for 2e81b94

• Replace squeel usage with vanilla active record.

  ayaankazerouni

  committed
  b622a46

  Copy full SHA for b622a46

• Manually fix merge conflicts in lock file

  ayaankazerouni

  committed
  8562ecb

  Copy full SHA for 8562ecb

• Update factory bot for incoming changes

  ayaankazerouni

  committed
  3508544

  Copy full SHA for 3508544

• Rails 5.1

  ayaankazerouni

  committed
  0fd6b22

  Copy full SHA for 0fd6b22

• Rails 5.2

  ayaankazerouni

  committed
  aeb2902

  Copy full SHA for aeb2902

• Fix deploy syntax

  ayaankazerouni

  committed
  9a5b618

  Copy full SHA for 9a5b618

• Remove obsolete config option; update mysql2

  ayaankazerouni

  committed
  e026bb3

  Copy full SHA for e026bb3

Commits on Jun 9, 2020

• Fix schema issues and start Dockerizing

  ayaankazerouni

  committed
  867339b

  Copy full SHA for 867339b

• Regress sprockets to < 4 for the time being

  ayaankazerouni

  committed
  0ad6022

  Copy full SHA for 0ad6022

Commits on Jun 10, 2020

• Docker-compose for databases

  ayaankazerouni

  committed
  eb0e28a

  Copy full SHA for eb0e28a

Commits on Jul 2, 2020

• Dockerfile and Compose file improvements

  ayaankazerouni

  committed
  5ea1de6

  Copy full SHA for 5ea1de6

• exception_handler config updates

  ayaankazerouni

  committed
  947b93a

  Copy full SHA for 947b93a

Commits on Jul 3, 2020

• Get README from staging

  ayaankazerouni

  committed
  2c34931

  Copy full SHA for 2c34931

• Merge branch 'staging' into rails-5-upgrade

  ayaankazerouni

  committed
  ac51fba

  Copy full SHA for ac51fba

Commits on Jul 8, 2020

• Set deploy branch to rails-5-upgrade

  ayaankazerouni

  committed
  1f51d4a

  Copy full SHA for 1f51d4a

Commits on Jul 20, 2020

• Merge branch 'staging' into rails-5-upgrade

  ayaankazerouni

  committed
  47896a3

  Copy full SHA for 47896a3

Commits on Oct 22, 2020

• update models

  Show description for 4f8c6f6
  awhicks

  committed
  4f8c6f6

  Copy full SHA for 4f8c6f6

• update jobs

  Show description for 705d76e
  awhicks

  committed
  705d76e

  Copy full SHA for 705d76e

• update migrations

  Show description for aa1e292
  awhicks

  committed
  aa1e292

  Copy full SHA for aa1e292

• update Gemfile.lock

  Show description for b35161c
  awhicks

  committed
  b35161c

  Copy full SHA for b35161c

• update Dockerfile

  Show description for c2ac771
  awhicks

  committed
  c2ac771

  Copy full SHA for c2ac771

• change runservers for dev

  Show description for 9afd3d3
  awhicks

  committed
  9afd3d3

  Copy full SHA for 9afd3d3

Commits on Nov 12, 2020

• updated exception_handler and rails 5.1

  Show description for 01ed81a
  awhicks

  committed
  01ed81a

  Copy full SHA for 01ed81a

• added ssl for testing

  Show description for 2e0f489
  awhicks

  committed
  2e0f489

  Copy full SHA for 2e0f489

• Merge pull request #181 from web-cat/rails-5-upgrade-changes

  Show description for b8cd412
  awhicks

  authored
  b8cd412

  Copy full SHA for b8cd412

• removed ssl

  Show description for 9b71517
  awhicks

  committed
  9b71517

  Copy full SHA for 9b71517

• Merge branch 'staging' into rails-5-upgrade

  awhicks

  authored
  681c5a3

  Copy full SHA for 681c5a3

Commits on Nov 17, 2020

• update gemfile

  Show description for aeb7de4
  awhicks

  committed
  aeb7de4

  Copy full SHA for aeb7de4

• Merge branch 'staging' into rails-5-upgrade

  awhicks

  authored
  ffadf4c

  Copy full SHA for ffadf4c

• update schema.rb

  awhicks

  committed
  256ac4b

  Copy full SHA for 256ac4b

Commits on Jul 29, 2021

• bundle updates for yanked gem

  Show description for 6143893
  awhicks

  committed
  6143893

  Copy full SHA for 6143893

• dockerfile updates

  Show description for bbb909f
  awhicks

  committed
  bbb909f

  Copy full SHA for bbb909f

• merge

  awhicks

  committed
  6cee2ed

  Copy full SHA for 6cee2ed

Commits on Jul 30, 2021

• fix merge issues

  Show description for 36fda2e
  awhicks

  committed
  36fda2e

  Copy full SHA for 36fda2e

• update schema and remove broken parameter

  Show description for d8ce07a
  awhicks

  committed
  d8ce07a

  Copy full SHA for d8ce07a

Commits on Feb 1, 2022

• Remove "try it here" link in notice after exercise is created or updated.

  Show description for fabdf50
  ayaankazerouni

  committed
  fabdf50

  Copy full SHA for fabdf50

Commits on Feb 3, 2022

• Update Dockerfile to place Gemfile at appropriate location

  Show description for 7ad6d8d
  ayaankazerouni

  committed
  7ad6d8d

  Copy full SHA for 7ad6d8d

Commits on Apr 7, 2022

• Fixed Gemfile according to new github policies

  i-m-karanagarwal

  committed
  e61f88f

  Copy full SHA for e61f88f

Commits on Apr 8, 2022

• Merge pull request #217 from i-m-karanagarwal/staging

  Show description for 7412915
  s-edwards

  authored
  7412915

  Copy full SHA for 7412915

Commits on Nov 17, 2022

• Peml integration basic

  

  Divyansh Mishra

  authored and

  Divyansh Mishra

  committed
  d3eaa7b

  Copy full SHA for d3eaa7b

Commits on Nov 28, 2022

• Peml integration refactoring

  

  Divyansh Mishra

  authored and

  Divyansh Mishra

  committed
  24aa055

  Copy full SHA for 24aa055

• Bug fixed and added help page

  

  Divyansh Mishra

  authored and

  Divyansh Mishra

  committed
  9b74718

  Copy full SHA for 9b74718

Commits on Nov 19, 2023

• update staging

  Show description for 3db4b79
  awhicks

  committed
  3db4b79

  Copy full SHA for 3db4b79

Commits on Nov 22, 2023

• creates new exercise collection for SPLICE along with a route to export data for catalog (/gym/exercises/embed_collection and /gym/exercises/export

  Show description for cab8fff
  awhicks

  committed
  cab8fff

  Copy full SHA for cab8fff

Commits on Dec 5, 2023

• remove collection and update urls

  Show description for 7fa0b75
  awhicks

  committed
  7fa0b75

  Copy full SHA for 7fa0b75

• Merge pull request #228 from web-cat/splice-portal

  Show description for cf99016
  awhicks

  authored
  cf99016

  Copy full SHA for cf99016

Commits on Dec 12, 2023

• tweaks to SPLICE API export endpoint

  awhicks

  authored
  da0e63b

  Copy full SHA for da0e63b

• typo in exercise_name

  awhicks

  authored
  2d2b4f1

  Copy full SHA for 2d2b4f1

Commits on Mar 21, 2024

• updating keywords as array and split exercise name phrases into words

  babz007

  committed
  f1fd061

  Copy full SHA for f1fd061

Commits on Mar 22, 2024

• Merge pull request #232 from babz007/keywordarray

  Show description for d01874f
  awhicks

  authored
  d01874f

  Copy full SHA for d01874f

Commits on Nov 15, 2024

• Merge remote-tracking branch 'origin/peml_integration' into staging

  s-edwards

  committed
  f367069

  Copy full SHA for f367069

• removed before_filter references, post-merge cleanup

  s-edwards

  committed
  f70514f

  Copy full SHA for f70514f

• fixed errant skip_before_action clause (?)

  s-edwards

  committed
  db12647

  Copy full SHA for db12647

Commits on Nov 18, 2024

• updated db/schema.rb after successful deployment

  s-edwards

  committed
  06b7bf8

  Copy full SHA for 06b7bf8

Commits on Dec 10, 2024

• Merge branch 'master' into staging

  s-edwards

  committed
  19d8718

  Copy full SHA for 19d8718

• added rails 4.2 version constraint to 2024 migrations

  s-edwards

  committed
  e2afc7b

  Copy full SHA for e2afc7b

Commits on Feb 7, 2025

• updated from live staging server

  s-edwards

  committed
  cb9070a

  Copy full SHA for cb9070a

• fixed publicly_visible() error

  s-edwards

  committed
  c2af174

  Copy full SHA for c2af174

Commits on Feb 18, 2025

• upgraded errors table for v0.8.0.0 of exception_handler gem

  s-edwards

  committed
  fcf881d

  Copy full SHA for fcf881d

Commits on Feb 21, 2025

• PEML translation now working, but still some data model mismatches (method name, class name, and csv-unquoted)

  s-edwards

  committed
  f249826

  Copy full SHA for f249826

Commits on Feb 24, 2025

• Updates to PEML data mapping

  s-edwards

  committed
  d89df52

  Copy full SHA for d89df52