From 0b5334431474c37575d1e25d58151c93c59a70ce Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 29 Jul 2024 20:27:15 +0000 Subject: [PATCH] update with project-syncing action --- .rspec | 1 - Gemfile | 8 +- Gemfile.lock | 406 ++++++++++++++++++++++++---------------------- appdev.Dockerfile | 37 ++--- config.ru | 8 +- 5 files changed, 230 insertions(+), 230 deletions(-) diff --git a/.rspec b/.rspec index 064157a..b83d9b7 100644 --- a/.rspec +++ b/.rspec @@ -1,4 +1,3 @@ --color --format documentation ---order default --require spec_helper diff --git a/Gemfile b/Gemfile index 62c3450..e2709d9 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "3.2.1" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" -gem "rails", "~> 7.0.4", ">= 7.0.4.3" +gem "rails", "~> 7.1.3", ">= 7.1.3.2" # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails] gem "sprockets-rails" @@ -13,7 +13,7 @@ gem "sprockets-rails" gem "pg", "~> 1.1" # Use the Puma web server [https://github.com/puma/puma] -gem "puma", "~> 5.0" +gem "puma" # Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails] gem "importmap-rails" @@ -75,7 +75,7 @@ end # =========== gem "appdev_support" gem "awesome_print" -gem "devise" # to be removed +gem "devise" gem "dotenv-rails" gem "faker" gem "htmlbeautifier" @@ -87,13 +87,13 @@ group :development do gem "annotate" gem "better_errors" gem "binding_of_caller" + gem "draft_generators" gem "grade_runner" gem "pry-rails" gem "rails_db" gem "rails-erd" gem "rufo" gem "specs_to_readme" - gem "web_git" end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 37bdeb3..427b615 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,97 +1,106 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + actioncable (7.1.3.3) + actionpack (= 7.1.3.3) + activesupport (= 7.1.3.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + zeitwerk (~> 2.6) + actionmailbox (7.1.3.3) + actionpack (= 7.1.3.3) + activejob (= 7.1.3.3) + activerecord (= 7.1.3.3) + activestorage (= 7.1.3.3) + activesupport (= 7.1.3.3) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8) - actionpack (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activesupport (= 7.0.8) + actionmailer (7.1.3.3) + actionpack (= 7.1.3.3) + actionview (= 7.1.3.3) + activejob (= 7.1.3.3) + activesupport (= 7.1.3.3) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) - rack (~> 2.0, >= 2.2.4) + rails-dom-testing (~> 2.2) + actionpack (7.1.3.3) + actionview (= 7.1.3.3) + activesupport (= 7.1.3.3) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8) - actionpack (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.3.3) + actionpack (= 7.1.3.3) + activerecord (= 7.1.3.3) + activestorage (= 7.1.3.3) + activesupport (= 7.1.3.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.1.3.3) + activesupport (= 7.1.3.3) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8) - activesupport (= 7.0.8) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.3.3) + activesupport (= 7.1.3.3) globalid (>= 0.3.6) - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) - activestorage (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activesupport (= 7.0.8) + activemodel (7.1.3.3) + activesupport (= 7.1.3.3) + activerecord (7.1.3.3) + activemodel (= 7.1.3.3) + activesupport (= 7.1.3.3) + timeout (>= 0.4.0) + activestorage (7.1.3.3) + actionpack (= 7.1.3.3) + activejob (= 7.1.3.3) + activerecord (= 7.1.3.3) + activesupport (= 7.1.3.3) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8) + activesupport (7.1.3.3) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) - ansispan (0.0.1) appdev_support (0.2.1) tabulo awesome_print (1.9.2) - base64 (0.1.1) + base64 (0.2.0) bcrypt (3.1.20) - better_errors (2.9.1) - coderay (>= 1.0.0) + better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) + rouge (>= 1.0.0) + bigdecimal (3.1.8) bindex (0.8.1) - binding_of_caller (1.0.0) - debug_inspector (>= 0.0.1) - bootsnap (1.16.0) + binding_of_caller (1.0.1) + debug_inspector (>= 1.2.0) + bootsnap (1.18.3) msgpack (~> 1.2) builder (3.2.4) - capybara (3.39.2) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) @@ -101,76 +110,82 @@ GEM color (1.8) color_namer (0.1.0) color (>= 1.4.1) - concurrent-ruby (1.2.2) - crack (0.4.5) + concurrent-ruby (1.3.1) + connection_pool (2.4.1) + crack (1.0.0) + bigdecimal rexml crass (1.0.6) + csv (3.3.0) date (3.3.4) - debug (1.7.2) - irb (>= 1.5.0) - reline (>= 0.3.1) - debug_inspector (1.1.0) - devise (4.9.3) + debug (1.9.2) + irb (~> 1.10) + reline (>= 0.3.8) + debug_inspector (1.2.0) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.5.0) - diffy (3.4.2) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.8.1) - dotenv-rails (2.8.1) - dotenv (= 2.8.1) - railties (>= 3.2) + diff-lcs (1.5.1) + domain_name (0.6.20240107) + dotenv (3.1.2) + dotenv-rails (3.1.2) + dotenv (= 3.1.2) + railties (>= 6.1) + draft_generators (0.0.4) + devise + indefinite_article draft_matchers (0.0.2) capybara color_namer rspec + drb (2.2.1) erubi (1.12.0) - faker (3.1.1) + faker (3.4.1) i18n (>= 1.8.11, < 2) - faraday (2.7.11) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http faraday-retry (1.0.3) - ffi (1.15.5) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) + ffi (1.16.3) + ffi-compiler (1.3.2) + ffi (>= 1.15.5) rake - git (1.18.0) - addressable (~> 2.8) - rchardet (~> 1.8) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) grade_runner (0.0.10) activesupport (>= 2.3.5) faraday-retry (~> 1.0.3) octokit (~> 5.0) oj (~> 3.13.12) rake (~> 13) - hashdiff (1.0.1) - htmlbeautifier (1.4.2) - http (5.1.1) + hashdiff (1.1.0) + htmlbeautifier (1.4.3) + http (5.2.0) addressable (~> 2.8) + base64 (~> 0.1) http-cookie (~> 1.0) http-form_data (~> 2.2) - llhttp-ffi (~> 0.4.0) + llhttp-ffi (~> 0.5.0) http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.14.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - importmap-rails (1.1.6) + importmap-rails (2.0.1) actionpack (>= 6.0.0) + activesupport (>= 6.0.0) railties (>= 6.0.0) - io-console (0.6.0) - irb (1.6.4) - reline (>= 0.3.0) - jbuilder (2.11.5) + indefinite_article (0.2.5) + activesupport + io-console (0.7.2) + irb (1.13.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + jbuilder (2.12.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) kaminari (1.2.2) @@ -185,127 +200,141 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - llhttp-ffi (0.4.0) + llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.20.0) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) - method_source (1.0.0) + method_source (1.1.0) mini_mime (1.1.5) - minitest (5.18.1) + minitest (5.23.1) msgpack (1.7.2) - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - net-imap (0.3.7) + mutex_m (0.2.0) + net-http (0.4.1) + uri + net-imap (0.4.11) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.5.0) net-protocol - nio4r (2.5.9) - nokogiri (1.15.5-x86_64-darwin) + nio4r (2.7.3) + nokogiri (1.16.5-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) octokit (5.6.1) faraday (>= 1, < 3) sawyer (~> 0.9) oj (3.13.23) orm_adapter (0.5.0) - pg (1.4.6) + pg (1.5.6) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (5.0.4) - puma (5.6.7) + psych (5.1.2) + stringio + public_suffix (5.0.5) + puma (6.4.2) nio4r (~> 2.0) - racc (1.6.2) - rack (2.2.8) - rack-protection (3.0.6) - rack + racc (1.8.0) + rack (3.0.11) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8) - actioncable (= 7.0.8) - actionmailbox (= 7.0.8) - actionmailer (= 7.0.8) - actionpack (= 7.0.8) - actiontext (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activemodel (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails (7.1.3.3) + actioncable (= 7.1.3.3) + actionmailbox (= 7.1.3.3) + actionmailer (= 7.1.3.3) + actionpack (= 7.1.3.3) + actiontext (= 7.1.3.3) + actionview (= 7.1.3.3) + activejob (= 7.1.3.3) + activemodel (= 7.1.3.3) + activerecord (= 7.1.3.3) + activestorage (= 7.1.3.3) + activesupport (= 7.1.3.3) bundler (>= 1.15.0) - railties (= 7.0.8) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + railties (= 7.1.3.3) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-erd (1.7.2) activerecord (>= 4.2) activesupport (>= 4.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) - rails_db (2.4.2) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rails_db (2.4.4) activerecord + csv kaminari rails (>= 5.0.0) ransack (>= 2.3.2) simple_form (>= 5.0.1) + sprockets-rails terminal-table - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) - method_source + railties (7.1.3.3) + actionpack (= 7.1.3.3) + activesupport (= 7.1.3.3) + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) - rake (13.0.6) - ransack (4.0.0) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rake (13.2.1) + ransack (4.1.1) activerecord (>= 6.1.5) activesupport (>= 6.1.5) i18n - rchardet (1.8.0) + rdoc (6.7.0) + psych (>= 4.0.0) redis (4.8.1) - regexp_parser (2.8.2) - reline (0.3.9) + regexp_parser (2.9.2) + reline (0.5.8) io-console (~> 0.5) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rexml (3.2.8) + strscan (>= 3.0.9) + rouge (4.2.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) + rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.6) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-rails (6.0.3) + rspec-support (~> 3.13.0) + rspec-rails (6.0.4) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -313,27 +342,21 @@ GEM rspec-expectations (~> 3.12) rspec-mocks (~> 3.12) rspec-support (~> 3.12) - rspec-support (3.12.1) + rspec-support (3.13.1) ruby-graphviz (1.2.5) rexml - ruby2_keywords (0.0.5) rubyzip (2.3.2) - rufo (0.16.3) + rufo (0.18.0) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - selenium-webdriver (4.8.6) + selenium-webdriver (4.10.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - simple_form (5.2.0) + simple_form (5.3.1) actionpack (>= 5.2) activemodel (>= 5.2) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) specs_to_readme (0.1.0) sprockets (4.2.1) concurrent-ruby (~> 1.0) @@ -342,32 +365,29 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.8-x86_64-darwin) - sqlite3 (1.6.8-x86_64-linux) - stimulus-rails (1.2.2) + sqlite3 (1.7.3-x86_64-darwin) + sqlite3 (1.7.3-x86_64-linux) + stimulus-rails (1.3.3) railties (>= 6.0.0) + stringio (3.1.0) + strscan (3.1.0) table_print (1.5.7) - tabulo (2.8.2) - tty-screen (= 0.8.1) - unicode-display_width (~> 2.2) + tabulo (3.0.1) + tty-screen (= 0.8.2) + unicode-display_width (~> 2.5) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) - tilt (2.1.0) - timeout (0.3.2) - tty-screen (0.8.1) - turbo-rails (1.4.0) + thor (1.3.1) + timeout (0.4.1) + tty-screen (0.8.2) + turbo-rails (2.0.5) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2023.3) - tzinfo (>= 1.0.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.9.1) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) + uri (0.13.0) warden (1.2.9) rack (>= 2.0.9) web-console (4.2.1) @@ -375,28 +395,22 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - web_git (0.1.0) - actionview - ansispan - diffy - git - sinatra - tzinfo-data - webdrivers (5.2.0) + webdrivers (5.3.1) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (~> 4.0) - webmock (3.18.1) + selenium-webdriver (~> 4.0, < 4.11) + webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) websocket (1.2.10) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.12) + zeitwerk (2.6.15) PLATFORMS x86_64-darwin-22 @@ -413,6 +427,7 @@ DEPENDENCIES debug devise dotenv-rails + draft_generators draft_matchers faker grade_runner @@ -422,8 +437,8 @@ DEPENDENCIES jbuilder pg (~> 1.1) pry-rails - puma (~> 5.0) - rails (~> 7.0.4, >= 7.0.4.3) + puma + rails (~> 7.1.3, >= 7.1.3.2) rails-erd rails_db redis (~> 4.0) @@ -439,7 +454,6 @@ DEPENDENCIES turbo-rails tzinfo-data web-console - web_git webdrivers webmock diff --git a/appdev.Dockerfile b/appdev.Dockerfile index 710c827..dff55ff 100644 --- a/appdev.Dockerfile +++ b/appdev.Dockerfile @@ -1,25 +1,22 @@ -FROM buildpack-deps:focal +FROM ubuntu:focal ### base ### +ENV DEBIAN_FRONTEND=noninteractive RUN yes | unminimize \ && apt-get install -yq \ + curl \ + wget \ acl \ zip \ unzip \ bash-completion \ build-essential \ - htop \ jq \ - less \ locales \ man-db \ - nano \ software-properties-common \ + libpq-dev \ sudo \ - time \ - vim \ - multitail \ - lsof \ && locale-gen en_US.UTF-8 \ && mkdir /var/lib/apt/dazzle-marks \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* @@ -84,8 +81,8 @@ COPY --chown=student:student Gemfile.lock /rails-template/Gemfile.lock RUN /bin/bash -l -c "bundle install" # Install Google Chrome -RUN sudo apt-get update && sudo apt-get install -y libxss1 -RUN wget https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.198-1_amd64.deb && \ +RUN sudo apt-get update && sudo apt-get install -y libxss1 && sudo rm -rf /var/lib/atp/lists/* +RUN wget https://mirror.cs.uchicago.edu/google-chrome/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.198-1_amd64.deb && \ sudo apt-get install -y ./google-chrome-stable_114.0.5735.198-1_amd64.deb # Install Chromedriver (compatable with Google Chrome version) @@ -133,14 +130,8 @@ USER student # Install graphviz (Rails ERD) RUN /bin/bash -l -c "sudo apt update && sudo apt install -y graphviz=2.42.2-3build2" -# Install fuser (bin/server) and expect (web_git) -RUN sudo apt install -y libpq-dev psmisc lsof expect - -# Install parity -RUN wget -qO - https://apt.thoughtbot.com/thoughtbot.gpg.key | sudo apt-key add - \ - && echo "deb http://apt.thoughtbot.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/thoughtbot.list \ - && sudo apt-get update \ - && sudo apt-get -y install parity=3.5.0-2 +# Install fuser (bin/server) +RUN sudo apt install -y psmisc # Install Node and npm RUN curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - \ @@ -153,7 +144,8 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - \ && sudo apt-get install -y yarn \ && sudo npm install -g n \ && sudo n 18 \ - && hash -r + && hash -r \ + && sudo rm -rf /var/lib/apt/lists/* # Install Redis. RUN sudo apt-get update \ @@ -161,9 +153,6 @@ RUN sudo apt-get update \ redis-server=5:5.0.7-2ubuntu0.1 \ && sudo rm -rf /var/lib/apt/lists/* -# Install heroku-cli -RUN /bin/bash -l -c "curl https://cli-assets.heroku.com/install.sh | sh" - # Install flyyctl RUN /bin/bash -l -c "curl -L https://fly.io/install.sh | sh" RUN echo "export PATH=\"/home/student/.fly/bin:\$PATH\"" >> ~/.bashrc @@ -204,5 +193,9 @@ __git_complete g __git_main" >> ~/.bash_aliases RUN echo "alias be='bundle exec'" >> ~/.bash_aliases # RUN sudo cp -r /home/student /home/gitpod && sudo chmod 777 /home/gitpod +# Alias rake grade to grade +RUN echo "alias grade='rake grade'" >> ~/.bash_aliases +RUN echo "alias grade:reset_token='rake grade:reset_token'" >> ~/.bash_aliases + # Add bin/rake to path for non-Rails projects RUN echo 'export PATH="$PWD/bin:$PATH"' >> ~/.bashrc diff --git a/config.ru b/config.ru index b2017fe..d597305 100644 --- a/config.ru +++ b/config.ru @@ -2,14 +2,8 @@ require_relative "config/environment" -if Rails.env.development? - map '/git' do - run WebGit::Server - end -end - map '/' do - run Rails.application + run Rails.application end Rails.application.load_server