Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev to staging #3647

Merged
merged 101 commits into from
Dec 14, 2020
Merged

Merge dev to staging #3647

merged 101 commits into from
Dec 14, 2020

Conversation

aonomike
Copy link
Contributor

@aonomike aonomike commented Dec 7, 2020

Issue addressed

fixes #

Screenshots (if appropriate):

Testing

abdellani and others added 30 commits May 31, 2019 01:52
…er-rails-2.0.0

Bump cucumber-rails from 1.8.0 to 2.0.0
…ri-1.10.5

Bump nokogiri from 1.10.4 to 1.10.5
…an-4.7.1

Bump brakeman from 4.7.0 to 4.7.1
dependabot-preview bot and others added 26 commits May 27, 2020 14:09
Bumps [devise](https://github.com/plataformatec/devise) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](heartcombo/devise@v4.7.0...v4.7.1)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
….3.5

[Security] Bump puma from 4.3.1 to 4.3.5
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.2 to 3.8.3.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](rspec/rspec-rails@v3.8.2...v3.8.3)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
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>
* 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]>
@aonomike aonomike changed the title Merge dev to test Merge dev to staging Dec 7, 2020
@aonomike aonomike merged commit 6753407 into staging Dec 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants