Merge conflicts

.cm/gitstream.cm

@@ -0,0 +1,61 @@
+# -*- mode: yaml -*-
+
+manifest:
+  version: 1.0
+
+size:
+  is:
+    small: {{ branch.diff.size < 100 }}
+    medium: {{ branch.diff.size >= 100 and branch.diff.size < 300 }}
+    large: {{ branch.diff.size >= 300 }}
+
+color:
+  small: "76DBBE"
+  medium: "2986CC"
+  large: "C90076"
+  waiting-for-review: "EDEDED"
+
+automations:
+  reviewer-assignment:
+    if:
+      - {{ pr.draft == false and pr.reviewers.length == 0 and pr.approvals.length == 0 }}
+    run:
+      - action: add-reviewers@v1
+        args:
+          reviewers: [autolab/developers-current]
+
+  size-labeling-small:
+    if:
+      - {{ size.is.small }}
+    run:
+      - action: add-label@v1
+        args:
+          label: "small"
+          color: {{ color.small }}
+
+  size-labeling-medium:
+    if:
+      - {{ size.is.medium }}
+    run:
+      - action: add-label@v1
+        args:
+          label: "medium"
+          color: {{ color.medium }}
+
+  size-labeling-large:
+    if:
+      - {{ size.is.large }}
+    run:
+      - action: add-label@v1
+        args:
+          label: "large"
+          color: {{ color.large }}
+
+  check-approvals:
+    if:
+      - {{ pr.draft == false and pr.approvals.length == 0 }}
+    run:
+      - action: add-label@v1
+        args:
+          label: "waiting-for-review"
+          color: {{ color["waiting-for-review"] }}

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/pull_request_template.md

@@ -1,8 +1,5 @@
 <!--- Provide a general summary of your changes in the Title above -->
 
-## Summary
-reviewpad:summary
-
 ## Description
 <!--- Describe your changes in detail -->
 

.github/workflows/codeql-analysis.yml

@@ -40,11 +40,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -71,4 +71,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/gitstream.yml

@@ -0,0 +1,49 @@
+# Code generated by gitStream GitHub app - DO NOT EDIT
+
+name: gitStream workflow automation
+
+on:
+  workflow_dispatch:
+    inputs:
+      client_payload:
+        description: The Client payload
+        required: true
+      full_repository:
+        description: the repository name include the owner in `owner/repo_name` format
+        required: true
+      head_ref:
+        description: the head sha
+        required: true
+      base_ref:
+        description: the base ref
+        required: true
+      installation_id:
+        description: the installation id
+        required: false
+      resolver_url:
+        description: the resolver url to pass results to
+        required: true
+      resolver_token:
+        description: Optional resolver token for resolver service
+        required: false
+        default: ''
+
+jobs:
+  gitStream:
+    timeout-minutes: 5
+    # uncomment this condition, if you dont want any automation on dependabot PRs
+    # if: github.actor != 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    name: gitStream workflow automation
+    steps:
+      - name: Evaluate Rules
+        uses: linear-b/gitstream-github-action@v2
+        id: rules-engine
+        with:
+          full_repository: ${{ github.event.inputs.full_repository }}
+          head_ref: ${{ github.event.inputs.head_ref }}
+          base_ref: ${{ github.event.inputs.base_ref }}
+          client_payload: ${{ github.event.inputs.client_payload }}
+          installation_id: ${{ github.event.inputs.installation_id }}
+          resolver_url: ${{ github.event.inputs.resolver_url }}
+          resolver_token: ${{ github.event.inputs.resolver_token }}

.github/workflows/rubyonrails.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
@@ -42,7 +42,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Ruby
         uses: ruby/setup-ruby@v1

CONTRIBUTING.md

@@ -90,7 +90,7 @@
   git rebase origin/master
   ```
 
-7. Push branch to autolab repo
+7. Push branch to Autolab repo
 
   ```
   git push origin <YOUR_BRANCH_NAME>

Gemfile

@@ -22,7 +22,7 @@ gem 'terser', '>= 1.1.7'
 gem 'coffee-rails', '>= 4.0.0'
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-gem 'mini_racer', '~> 0.6.3' , platforms: :ruby
+gem 'mini_racer', '~> 0.6.3', platforms: :ruby
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
@@ -45,8 +45,8 @@ gem 'slack-notifier'
 gem 'exception_notification', ">= 4.1.0"
 
 # Used by lib/tasks/autolab.rake to populate DB with dummy seed data
-gem 'populator', '>=1.0.0'
 gem 'rake', '>=10.3.2'
+gem 'populator', '>=1.0.0'
 
 # To communicate with MySQL database
 gem 'mysql2', '~>0.5'
@@ -59,6 +59,7 @@ gem 'devise', '>=4.5.0'
 gem 'omniauth', '>=1.2.2'
 gem 'omniauth-facebook', '>=2.0.0'
 gem 'omniauth-google-oauth2', '>=0.2.5'
+gem 'omniauth-rails_csrf_protection', '~> 1.0'
 gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth'
 
 # OAuth2 authentication
@@ -73,9 +74,6 @@ gem 'doorkeeper'
 # For block and throttling abusive requests
 gem 'rack-attack'
 
-# Adds It also adds f.error_messages and f.error_message_on to form builders
-gem 'dynamic_form'
-
 # Supports zip file generation.
 gem 'rubyzip'
 
@@ -154,6 +152,9 @@ gem 'byebug', '>=3.5.1'
 # and it is crucial for us
 gem 'prawn', '0.13.0'
 
+# for submission diffs
+gem 'diffy'
+
 # LDAP Lookup
 gem 'net-ldap'
 
@@ -173,3 +174,9 @@ gem "jwt"
 # Avoid "already initialized constant" errors (https://github.com/ruby/net-imap/issues/16)
 gem "net-http"
 gem 'uri', '0.10.3'
+
+# To generate slugged urls
+gem 'friendly_id', '~> 5.5.0'
+
+# to sanitize CSV files
+gem 'csv-safe'

Gemfile.lock

@@ -115,6 +115,9 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
+    csv (3.3.0)
+    csv-safe (3.3.1)
+      csv (~> 3.0)
     daemons (1.4.1)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
@@ -131,16 +134,14 @@ GEM
       responders
       warden (~> 1.2.3)
     diff-lcs (1.5.0)
+    diffy (3.4.2)
     docile (1.1.5)
     doorkeeper (5.6.8)
       railties (>= 5)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    dynamic_form (1.3.1)
-      actionview (> 5.2.0)
-      activemodel (> 5.2.0)
     erb_lint (0.5.0)
       activesupport
       better_html (>= 2.0.1)
@@ -171,6 +172,8 @@ GEM
       sassc (>= 2.2)
       sassc-rails (>= 2.1)
       sprockets-rails (>= 2.1.3)
+    friendly_id (5.5.1)
+      activerecord (>= 4.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     hashdiff (1.1.0)
@@ -244,11 +247,11 @@ GEM
     newrelic_rpm (9.6.0)
       base64
     nio4r (2.7.0)
-    nokogiri (1.15.5-arm64-darwin)
+    nokogiri (1.16.5-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-darwin)
+    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)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -274,6 +277,9 @@ GEM
     omniauth-oauth2 (1.8.0)
       oauth2 (>= 1.4, < 3)
       omniauth (~> 2.0)
+    omniauth-rails_csrf_protection (1.0.1)
+      actionpack (>= 4.2)
+      omniauth (~> 2.0)
     omniauth-shibboleth-redux (2.0.0)
       omniauth (>= 2.0.0)
     orm_adapter (0.5.0)
@@ -301,7 +307,7 @@ GEM
       stringio
     public_suffix (5.0.4)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.9)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-protection (3.2.0)
@@ -340,13 +346,13 @@ GEM
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.1.0)
-    rdoc (6.6.2)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
     regexp_parser (2.8.3)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.6)
+    rexml (3.3.9)
     rouge (4.2.0)
     rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
@@ -450,14 +456,14 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.8.1)
+    webrick (1.8.2)
     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)
-    yard (0.9.34)
+    yard (0.9.36)
     zeitwerk (2.6.12)
 
 PLATFORMS
@@ -467,7 +473,6 @@ PLATFORMS
   x86_64-darwin-19
   x86_64-darwin-20
   x86_64-darwin-21
-  x86_64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -480,15 +485,17 @@ DEPENDENCIES
   capybara
   codeclimate-test-reporter
   coffee-rails (>= 4.0.0)
+  csv-safe
   database_cleaner
   devise (>= 4.5.0)
+  diffy
   doorkeeper
   dotenv-rails
-  dynamic_form
   erb_lint
   exception_notification (>= 4.1.0)
   factory_bot_rails
   fomantic-ui-sass (= 2.8.8.1)
+  friendly_id (~> 5.5.0)
   httparty
   jbuilder (>= 2.0)
   jquery-rails
@@ -511,6 +518,7 @@ DEPENDENCIES
   omniauth (>= 1.2.2)
   omniauth-facebook (>= 2.0.0)
   omniauth-google-oauth2 (>= 0.2.5)
+  omniauth-rails_csrf_protection (~> 1.0)
   omniauth-shibboleth-redux (~> 2.0)
   overcommit
   populator (>= 1.0.0)