Merging development into master #2025
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Partial was missing a variable
Fix bug when editing question
Will help in debugging tests that are failing on Travis
Fix broken specs with random see 55679 Fix broken tests for random seed 19381 Temporarily disable travis security checks Since I'm testing the specs, this should help make it faster Fix bug caused by random Org locale Fixes recurring issue with tests being loaded in German Fix broken specs Fix tests breaking with seed 60029 Fix broken specs with seed 12116 Fix broken specs with seed 51011 Fix broken template upgrades specs Fix travis artifacts addons Add Travis asset debugging Remove Amazon S3 region from asset uploads config Move S3 configs to local travis file Re-add hygiene tasks to Travis YML Disable broken test for now Refactor tests for template upgrade customisations
(Colour variables aren't being set properly)
* Add ActiveRecord Session storage * Update Gemfile to fix failing tests Moved Dotenv to dev and test group * Add length limit to session_id for MySQL databases * Update session_id column length to 64 * Update schema with new constraints on session_id
* Add Rollbar gem for catching production errors * Update Rollbar config to obfuscate user IP address * Fix Rollbar configuration for optional gem
I thin this needs to be loaded earlier than the initalizers, since there's middleware to be included Should still be optional.
Fix rollbar loading when optionally included
…eaned-up Update asset structure with webpacker gem
Add support for AWS file storage with Dragonfly
…o travis added eslintrc.json back moved eslintrc to loaders dir removed eslint init statement fixed up eslinter updated rack and destructured array and object assignments in js. updated release portion of readme added eslintrc back to gitignore fixed issue with create plan JS, fixed some warnings in specs removed console.log statements and updated linter task in travis
Updated gem dependencies and fixed linter issues
- Using fontawesome icons file-pdf-o and file-word-o
Fix for Issue #1164
…smine added lint and updated bundle task to use yarn added lint and updated bundle task to use yarn
* updated api stats controller to use Org model's method * updated org.plans to check role.active flag * updated other api stats endpoints to use org.plans
refactoring css variables to be more descriptive when re-branding the site
Moved deactivate logic to Role model and added specs
Devise circumvents running validations on the user models when invite! is called. I updated this call to adhere to validations, and I've updated the form to request the name,org of the user when a plan is shared with them. This should fix the issue for both newly created share-plan users, and those with previous, bad data in the system. You may want to consider re-running your validations(or fixup) scripts for users as you can have some invalid ones that you'll need to set a default name/org
Patch issue with share plans on development
…uestions. Fix for issue #1725 The question_options field on the Customisable Phase template has the following changes: - the 'Text' label has the asterick for required. - the error message for missing question option now reads "You must have at least one option with accompanying text." - Corrected some Rubocop errors on the files added.
Further changes for Text field should be mandatory for option based q…
… match logic of plan export (#2004) refactored plan.visibility_allowed? to call underlying method on phases refactored plan.visibility_allowed? to call underlying method on phases fixed tests
…ser account, changed devise registrations/new so the js could find the create-account-form.
issue/2014: Issues Preventing Shiboleth account creation or linking from the homescreen
…ance (#2021) fixed typos
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolved merge conflicts between development and master. Since we do not allow direct pushes to development or master needed to create a new branch for the reconciliation