merge staging into master #3658
Merged
Conversation
This file contains 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
differentiate Card button from member status
…into 3008-card-details-ux
…99_sunday_events_shows_as_saturday_event
…99_sunday_events_shows_as_saturday_event
…99_sunday_events_shows_as_saturday_event
…99_sunday_events_shows_as_saturday_event
…99_sunday_events_shows_as_saturday_event
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.3.0 to 2.3.1. **This update includes a security fix.** - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](flavorjones/loofah@v2.3.0...v2.3.1) Signed-off-by: dependabot-preview[bot] <[email protected]>
Bumps [airbrake](https://github.com/airbrake/airbrake) from 9.4.3 to 9.5.0. - [Release notes](https://github.com/airbrake/airbrake/releases) - [Changelog](https://github.com/airbrake/airbrake/blob/master/CHANGELOG.md) - [Commits](airbrake/airbrake@v9.4.3...v9.5.0) Signed-off-by: dependabot-preview[bot] <[email protected]>
…oller Refactoring subscription controller
Bumps [puffing-billy](https://github.com/oesmith/puffing-billy) from 2.1.1 to 2.2.0. - [Release notes](https://github.com/oesmith/puffing-billy/releases) - [Changelog](https://github.com/oesmith/puffing-billy/blob/master/CHANGELOG.md) - [Commits](oesmith/puffing-billy@v2.1.1...v2.2.0) Signed-off-by: dependabot-preview[bot] <[email protected]>
Bumps [rack-timeout](https://github.com/sharpstone/rack-timeout) from 0.5.1 to 0.5.2. - [Release notes](https://github.com/sharpstone/rack-timeout/releases) - [Changelog](https://github.com/sharpstone/rack-timeout/blob/master/CHANGELOG.md) - [Commits](zombocom/rack-timeout@v0.5.1...v0.5.2) Signed-off-by: dependabot-preview[bot] <[email protected]>
We are now using Zenhub for issue tracking. Update Contribution guidelines to reflect the same.
Update from Waffle to Zenhub
[WIP] Improve UX for User Profile Card Details
…imeout-0.5.2 Bump rack-timeout from 0.5.1 to 0.5.2
…ke-9.5.0 Bump airbrake from 9.4.3 to 9.5.0
…g-billy-2.2.0 Bump puffing-billy from 2.1.1 to 2.2.0
Bumps [acts_as_tree](https://github.com/amerine/acts_as_tree) from 2.9.0 to 2.9.1. - [Release notes](https://github.com/amerine/acts_as_tree/releases) - [Commits](amerine/acts_as_tree@v2.9.0...v2.9.1) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [kaminari](https://github.com/kaminari/kaminari) from 1.1.1 to 1.2.1. **This update includes a security fix.** - [Release notes](https://github.com/kaminari/kaminari/releases) - [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md) - [Commits](kaminari/kaminari@v1.1.1...v1.2.1) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Setup semaphore v2
* Rename method filter is a core ruby method, and this name was clashing with the core ruby method. * Update RuboCop cop names * Require rubocop performance Performance cops have been moved to seperate gem. * Require rubocop rails * Update Faker deprecated arguments * Set rubocop version * Fix some rubocop failures * Fix slug conflict * Use update when updating params * Rubocop - Ignore specific files.. for now
Bumps [rack](https://github.com/rack/rack) from 2.2.2 to 2.2.3. **This update includes a security fix.** - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](rack/rack@v2.2.2...2.2.3) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.5 to 1.10.8. **This update includes a security fix.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.10.5...v1.10.8) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.6 to 3.142.7. - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES) - [Commits](https://github.com/SeleniumHQ/selenium/commits) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [json](https://github.com/flori/json) from 2.2.0 to 2.3.0. **This update includes a security fix.** - [Release notes](https://github.com/flori/json/releases) - [Changelog](https://github.com/flori/json/blob/master/CHANGES.md) - [Commits](ruby/json@v2.2.0...v2.3.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.29.0 to 3.32.2. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](teamcapybara/capybara@3.29.0...3.32.2) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
* [Security] Bump websocket-extensions from 0.1.4 to 0.1.5 Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.4 to 0.1.5. **This update includes security fixes.** - [Release notes](https://github.com/faye/websocket-extensions-ruby/releases) - [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md) - [Commits](faye/websocket-extensions-ruby@0.1.4...0.1.5) Signed-off-by: dependabot-preview[bot] <[email protected]> * Quick patch for feature test failing. Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Riccardo Giomi <[email protected]>
Update Ruby version to 2.6.3
fix heroku yarn
remove yarn.lock
Updates for Heroku end-of-life issue
Merge dev to staging
remove yui compressor
Merge dev into staging
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.
update master branch with all recent changes. We are also upgrading the heroku stack.