Phantomjs #3
Closed
Phantomjs #3
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
Crop accept/reject notification improvements
…-database-seeding-improvement
Quantity and planted_from are not required to add a planting. This change handles the cases where one or both attributes are missing. Fixes Growstuff#633
Replaced before and should with let and expect, respectively. Issue Growstuff#633
New route to /robots.txt and some specific logic to switch on if the subdomain is staging or not. Staging will not allow any crawlers at all, production does not have any current limitations
Also assert that the response is the actual file contents instead of mocking the method call
Poltergeist v1.5.1 is nearly a year old, and relies on PhantomJS 1.8, which is 2.5 years old and increasingly hard to find in OS package managers.
Production push (release 8): request crops, search sci/alt names, garden photos, and more
Upgrade poltergeist to v1.6.
…staging Feature/robots dissalow on staging
Growstuff#621 Crop varieties sidebar
Switching to new secrets format
resolved issue-610 to display only active planting
Fix more checkbox labels in registration and email editing
Version: 4.2.1 Advisory: CVE-2015-2963 Criticality: Medium URL: https://robots.thoughtbot.com/paperclip-security-release Title: Paperclip Gem for Ruby vulnerable to content type spoofing Solution: upgrade to >= 4.2.2
Version: 1.7.2 Advisory: CVE-2015-3448 Criticality: Unknown URL: http://www.osvdb.org/show/osvdb/117461 Title: Rest-Client Gem for Ruby logs password information in plaintext Solution: upgrade to >= 1.7.3 Name: rest-client Version: 1.7.2 Advisory: CVE-2015-1820 Criticality: Unknown URL: rest-client/rest-client#369 Title: rubygem-rest-client: session fixation vulnerability via Set-Cookie headers in 30x redirection responses Solution: upgrade to >= 1.8.0
Version: 3.1.2 Advisory: CVE-2015-1840 Criticality: Unknown URL: https://groups.google.com/forum/#!topic/ruby-security-ann/XIZPbobuwaY Title: CSRF Vulnerability in jquery-ujs and jquery-rails Solution: upgrade to >= 4.0.4, ~> 3.1.3
Upgrade to ruby 2.1.6 for CVE-2015-1855
Conflicts: CONTRIBUTORS.md
Show roles in member profile page
Cache thumbnails
…into phantomjs Conflicts: spec/features/admin/forums_spec.rb spec/features/crops/alternate_name_spec.rb spec/features/crops/crop_detail_page_spec.rb spec/features/member_profile_spec.rb spec/features/rss/members_spec.rb spec/features/scientific_name_spec.rb spec/features/signin_spec.rb spec/features/signup_spec.rb
Not needed - test issue was caused by wrong link text This reverts commit d65ab59.
|
What's the status of this? Do we need to re-open it against growstuff/growstuff? |
|
I think so - we'll need to combine your changes and mine and do a clean PR. |
|
OK, cool. I'd like to get Release 10 out in the next few days - shall we
aim to get this into Release 11?
|
|
Yeah, makes sense. On 20 May 2016 at 10:39, pozorvlak notifications@github.com wrote:
|
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.
This fixes the merge conflicts. I'm now testing it out locally.