Merging master into 2-0-stable (one month of commits in master) #2639
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
And formatted for easier reading and writing.
This should prevent issues like openfoodfoundation#2427. Also converted comments into HTML syntax so that you don't have to delete them when creating a PR.
…-fork-version Update Spree's fork revision in Gemfile
This is more appropriate, and allows changes the separate route files to be loaded automatically in the development environment.
The methods :update! and :update (to replace :update_attributes! and :update_attributes) were not added until Rails 4. See this for more information: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Rails/ActiveRecordAliases
…isable_rubocop_cop_rails_activerecordaliases Disable rubocop cop "Rails/ActiveRecordAliases"
We don't need to visit the admin dashboard before each spec. On my machine: 54 seconds before 47 seconds after speed up by 13%
From 48s to 44s: 8% speed up
Enterprises can be in different order. Using `with_options` doesn't care about the order.
From 18s to 12s: 33% speed up
The code has been inactive since 2015 and was probably obsolete anyway.
From 1.9s to 1.7s.
From 6.5s to 5.3s.
From 40s to 36s.
From 68 to 63 seconds.
From 80s to 74s.
…pendabot/bundler/eventmachine-1.2.7 Bump eventmachine from 1.2.3 to 1.2.7
…pendabot/bundler/foreigner-1.7.4 Bump foreigner from 1.6.1 to 1.7.4
…tter_policy_page [Cookies] Updated cookies policy page text
…der_link_in_subscription_emails_unless_user Subscription emails for customer should not link to order page if customer has no user account
…pendabot/bundler/angular-rails-templates-0.3.0 Bump angular-rails-templates from 0.2.0 to 0.3.0
…d_code Removed old files that were used with, now unsupported, heroku
…nner_bug [Cookies] Added new test to cookies spec to cover bug on cookies banner and fix…
luisramos0
changed the title
…nner_font_size [Cookies] Increased cookies banner font size for med/large screens to improve readability
|
Please, please, #assignyourself, please! 🙏 |
|
one comment/question is: with local git log I see only one commit with the full merge, here in GH it shows all the 160 separate commits... |
|
These are all the commits we're bringing in from |
luisramos0
force-pushed
the
2-0-stable-sept
branch
from
f3348ec to
210ee8b
Compare
|
I found a problem in the Gemfile, stripe should have been 3.3.2. It was a mistake in my conflict resolution.
|
luisramos0
force-pushed
the
2-0-stable-sept
branch
from
210ee8b to
34186d0
Compare
luisramos0
force-pushed
the
2-0-stable-sept
branch
from
34186d0 to
89d51d7
Compare
|
can we merge it then @luisramos0 ? |
|
I was just waiting 2 approvals as a normal PR. |
|
I thought we consider it one of those no-review PRs but it's fine. |
sauloperez
approved these changes
Sep 5, 2018
mkllnk
approved these changes
Sep 5, 2018
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.
What? Why?
Merging master into 2-0-stable.
This is the result of:
git checkout master
git pull upstream master
git checkout 2-0-stable
git pull upstream 2-0-stable
git checkout -b 2-0-stable-sept
git merge master
git add spec/controllers/spree/orders_controller_spec.rb
git add Gemfile
git add Gemfile.lock
git commit
git push origin 2-0-stable-sept
The last commit of the last merge into 2-0-stable was on the 27th July, so this one looks good as it starts on the following commit on the 30th July and then goes up to the 4th of September.