Sync Development with Bugfixes from Master - #2103
Merged
Merged
Conversation
Merge Development into Master
Partial was missing a variable
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
* updated auth logic on public plans * added skip_authorization statement as 'authorize' is no longer used
fixed issue with translatable text having a newline between the closing quote and the closing paren fixed issues with translatable text in planscsv export and sharing notification fixed issue with translatable on templates controller fixed issue with multiline strings in translatable:find fixed issue with multiline strings in translatable:find cleaned up en-US translations
Merging development into master
fix to upgrade rake task
Fix upgrade rake task
…onth by default, re-add instance variables, fix other minor bugs
fix bugs with API
johnpinto1
approved these changes
Apr 23, 2019
johnpinto1
left a comment
johnpinto1
left a comment
Contributor
There was a problem hiding this comment.
Good. Bug fixes in master that are required in development.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
No description provided.