fix: vcs url error not displaying in edit application page

.github/workflows/build.yml

@@ -12,6 +12,8 @@ on:
     branches:
       - master
       - develop
+      - '[0-9].[0-9]'
+      - '[0-9].[0-9].[0-9]'
 
 jobs:
   build:

CHECKS

@@ -1,4 +1,4 @@
 WAIT=10
-ATTEMPTS=300
+ATTEMPTS=100
 
 /users/sign_in  Sign in to

app/controllers/questionnaires_controller.rb

@@ -83,13 +83,13 @@ def create
   def update
     update_params = questionnaire_params
     update_params = convert_school_name_to_id(update_params)
-
+    @agreements = Agreement.all
     respond_to do |format|
       if @questionnaire.update_attributes(update_params)
         format.html { redirect_to questionnaires_path, notice: 'Application was successfully updated.' }
         format.json { head :no_content }
       else
-        format.html { redirect_to edit_questionnaires_url }
+        format.html { render action: "edit" }
         format.json { render json: @questionnaire.errors, status: :unprocessable_entity }
       end
     end

docs/docs-overview.md

@@ -12,6 +12,7 @@ Documentation to get you started:
 - [Questionnaires](questionnaires.md)
 - [Messages](messages.md)
 - [Bus Lists](busses.md)
+- [Users & Staff](users-and-staff.md)
 - _More to come..._
 
 ## Timeline of a hackathon

docs/users-and-staff.md

@@ -0,0 +1,72 @@
+---
+id: users-and-staff
+title: Users & Staff
+---
+
+**Accessible by:** Directors 
+
+The Users & Staff page is an easy way to manage the users of your hackathon's HackathonManager instance. In addition to attendees, you can also manage volunteers, organizers and directors. 
+
+## User Management
+Certain attributes within a user can be modified. 
+
+**Email:** The email for the user, used for signing into HackathonManager.  
+**Role:** Role for the user, see [Roles](#roles).  
+**Login access:** Allow/Block login for that specific user. Will also disable the weekly report email if that user is an admin.   
+**Receive weekly report:** A weekly email report on admissions, bus lists, and messages. Only sent when there are weekly updates up until 7 days past the event.
+
+
+## Roles
+Roles allow for organization and permission access for users. There are four roles within HackathonManager: **User**, **Volunteer**, **Organizer** and **Director** with Director being the highest.
+
+### Permissions
+The following are permissions for all admin roles. An admin role is any role other than User that has access to the admin dashboard. User can only create, view, edit and delete their own questionnaire.
+
+|                            |  Volunteer  | Organizer | Director |
+|---|:-:|:-:|:-:|
+| `View Questionnaires`             |      ✔️      |     ✔️     |     ✔️    |
+| `Create Questionnaires`           |             |           |     ✔️    |
+| `Update Questionnaires`           |             |           |     ✔️    |
+| `Destroy Questionnaires`          |             |           |     ✔️    |
+| `Check in Hackers`                |      ✔️      |     ✔️     |     ✔️    |
+| `View Messages`                   |             |     ✔️     |     ✔️    |
+| `Modify Message Triggers`         |             |           |     ✔️    |
+| `Send Messages`                   |             |           |     ✔️    |
+| `Create Messages`                 |             |           |     ✔️    |
+| `Update Messages`                 |             |           |     ✔️    |
+| `Destroy Messages`                |             |           |     ✔️    |
+| `View Statistics`                 |             |     ✔️     |     ✔️    |
+| `View Trackable Tags`             |             |     ✔️     |     ✔️    |
+| `(API) View Trackable Tags`       |      ✔️      |     ✔️     |     ✔️    |
+| `Create Trackable Tags`           |             |           |     ✔️    |
+| `Update Trackable Tags`           |             |           |     ✔️    |
+| `Destroy Trackable Tags`          |             |           |     ✔️    |
+| `View [own] Trackable Events`     |      ✔️      |     ✔️     |     ✔️    |
+| `View [other] Trackable Events`   |             |     ✔️     |     ✔️    |
+| `Create Trackable Events`         |      ✔️      |     ✔️     |     ✔️    |
+| `Destroy [own] Trackable Events`  |      ✔️      |     ✔️     |     ✔️    |
+| `Destroy [other] Trackable Events`|             |           |     ✔️    |
+| `View Schools`                    |      ✔️      |     ✔️     |     ✔️    |
+| `Create Schools`                  |             |           |     ✔️    |
+| `Update Schools`                  |             |           |     ✔️    |
+| `Merge Schools`                   |             |           |     ✔️    |
+| `Message Schools`                 |             |           |     ✔️    |
+| `View Users & Staff`              |             |           |     ✔️    |
+| `Update Users & Staff`            |             |           |     ✔️    |
+| `Destroy Users & Staff`           |             |           |     ✔️    |
+| `Modify Account Role`             |             |           |     ✔️    |
+| `View Legal Agreements`           |             |           |     ✔️    |
+| `Update Legal Agreements`         |             |           |     ✔️    |
+| `Destroy Legal Agreements`        |             |           |     ✔️    |
+| `View Hackathon Settings`         |             |           |     ✔️    |
+| `Update Hackathon Settings`       |             |           |     ✔️    |
+| `View App Authentication`         |             |           |     ✔️    |
+| `Create OAuth2 Applications`      |             |           |     ✔️    |
+| `Update OAuth2 Applications`      |             |           |     ✔️    |
+| `Destroy OAuth2 Applications`     |             |           |     ✔️    |
+| `View Sidekiq`                    |             |           |     ✔️    |
+| `View Blazer`                     |             |           |     ✔️    |
+| `View Data Exports`               |             |           |     ✔️    |
+| `Export Hackathon Data`           |             |           |     ✔️    |
+_Own:_ Objects/events that were created by that user.    
+_Other:_ Objects/events that were created by any user.

website/sidebars.json

@@ -12,7 +12,7 @@
       "updating-hm",
       "2.0-whats-new"
     ],
-    "Docs": ["docs-overview", "questionnaires", "messages", "busses"],
+    "Docs": ["docs-overview", "questionnaires", "messages", "busses", "users-and-staff"],
     "API": ["api-overview", "api-testing-setup"],
     "Getting Help": ["resources"]
   }