Code

Development fix#861

Code

Merged

Domur merged 23 commits intomastermitre-cyber-academy/ctf-scoreboard:masterfrom development-fixmitre-cyber-academy/ctf-scoreboard:development-fixCopy head branch name to clipboardJun 13, 2022

+6-20

Commits

Commits on Feb 17, 2022

• updated some outdated gems that broke from a recent automatic dependabot merge

  Domur

  committed
  76fa305

• Merge branch 'master' of github.com:mitre-cyber-academy/ctf-scoreboard into fix/broken-gems

  Domur

  committed
  750d840

Commits on Feb 24, 2022

• restored countries to previous version to avoid some things being deprecated in conjunction with other gems. resolved a lint error relating to validating teams when they're required on a user

  Domur

  committed
  1c35faf

• updated nokogiri to 1.13.2 to some resolve critical vulnerability warnings

  Domur

  committed
  7ed1e46

• reverted pg to previous version to be in line with a previous version

  Domur

  committed
  9f4fc25

Commits on Mar 7, 2022

• further reverted some dependencies that were creating new errors

  Domur

  committed
  dfcb4f8

• Merge branch 'master' of github.com:mitre-cyber-academy/ctf-scoreboard into fix/broken-gems

  Domur

  committed
  d665a3f

Commits on Mar 8, 2022

• Merge branch 'master' of github.com:mitre-cyber-academy/ctf-scoreboard into fix/broken-gems

  Domur

  committed
  8f2c357

Commits on Mar 9, 2022

• fixed some deprecations that holding back a bunch of dependencies from being bumped

  Domur

  committed
  8589e2a

• Merge branch 'master' of github.com:mitre-cyber-academy/ctf-scoreboard into fix/broken-gems

  Domur

  committed
  90d7cb4

• finalized dependency updates for now

  Domur

  committed
  e367091

Commits on Apr 5, 2022

• Merge branch 'master' of github.com:mitre-cyber-academy/ctf-scoreboard into fix/broken-gems

  Domur

  committed
  19a7fcf

Commits on Apr 11, 2022

• added rail admin dependency from update

  Domur

  committed
  c2af471

Commits on Apr 14, 2022

• added temporary fix that prevents a race condition when loading jQuery in development

  Domur

  committed
  279e1dd

• Merge branch 'master' of github.com:mitre-cyber-academy/ctf-scoreboard into rails-admin-3-fix

  Domur

  committed
  0963aa9

Commits on Apr 27, 2022

• updated sprockets to fix the js pipeline issue. returned development to debug mode as before

  Domur

  committed
  5a6e9c5

• Merge branch 'master' into development-fix

  Domur

  authored
  bf4b209

Commits on Jun 13, 2022

• gem updates

  Domur

  committed
  3439e7e

• Merge branch 'master' of github.com:mitre-cyber-academy/ctf-scoreboard into development-fix

  Domur

  committed
  5fd7e15

• Merge branch 'master' of github.com:mitre-cyber-academy/ctf-scoreboard into development-fix

  Domur

  committed
  2a7bfae

• removed sassc-rails gem

  Domur

  committed
  d08914a

• Merge branch 'development-fix' of github.com:mitre-cyber-academy/ctf-scoreboard into development-fix

  Domur

  committed
  e671969

• also remove sassc-rails from Gemfile.lock

  Domur

  committed
  a21639f