mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-19 06:15:44 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,815 Commits 61 Branches 82 Tags
0df52b3cd88ed469199bb315f02cfda810e2ae8b
Commit Graph

2815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mackenzie Morgan
0df52b3cd8 update paperclip 2016-05-20 11:28:55 +01:00
Daniel O'Connor
18cd8f5966 #507 #813 Add spec 2016-05-19 15:53:11 -04:00
Kevin Rio
5a31619b46 If i reply to a notification directly, it's not marked as read. #507 2016-05-19 15:53:11 -04:00
Daniel O'Connor
4b4e0cf69a $ rubocop --only HashSyntax --auto-correct 
483 files inspected, 2018 offenses detected, 2018 offenses corrected
 2016-05-19 15:53:11 -04:00
Mackenzie Morgan
8659ebca2d switch from less to sass 
* dependency hell + bit rot on upstream libraries  prevents installation on OS X
 2016-05-19 15:52:54 -04:00
Miles Gould
238e0be682 Merge branch 'upgrade_misc_dev_tools' into dev 2016-05-19 15:02:32 +01:00
Mackenzie
4324ceb8ca Merge pull request #884 from pozorvlak/bump_ruby_22x 
Bump ruby to 2.2.x
 2016-05-19 09:40:48 -04:00
Mackenzie
19d6c8f293 Merge pull request #882 from pozorvlak/install_all_gems_on_travis 
Install *all* gems in TravisCI
 2016-05-19 09:37:08 -04:00
Miles Gould
bcb74c7ed8 Merge branch 'dev' into bump_ruby_22x 2016-05-19 14:15:33 +01:00
Miles Gould
4a341bb7ab Install *all* gems in CI 
Previously we were only installing the gems needed for testing. This
caused our CI to miss an incompatibility problem with a gem that was
only needed for another environment:
https://github.com/Growstuff/growstuff/pull/878#discussion_r63745751
 2016-05-19 13:33:36 +01:00
Daniel O'Connor
02615dc522 $ bundle update selenium-webdriver guard guard-rspec rails factory_girl pg simplecov coveralls newrelic_rpm better_errors minitest 2016-05-17 13:33:12 +09:30
Cesy
260b16da11 Merge pull request #865 from CloCkWeRX/fix_progress 
Fix progress calculations
 2016-04-21 08:02:37 +01:00
Daniel O'Connor
cf0a646699 Add EOF newlines 2016-04-14 09:59:36 +09:30
Daniel O'Connor
12ad16a05a Newlines 2016-04-13 08:41:05 +09:30
Cesy
d525afb07c Merge pull request #866 from CloCkWeRX/fix_posts_path 
Fixes #851 Correct the link to be specific to the author
 2016-04-11 18:56:45 +01:00
Daniel O'Connor
3ff3ffa457 Don't update that link, geesh. Need more coffee! 2016-04-11 09:55:03 +09:30
Daniel O'Connor
e3c689ba6b Fixes #851 Correct the link to be specific to the author 2016-04-11 09:51:52 +09:30
Daniel O'Connor
82553d6e0a Avoid time travel in favour of calculating a number of past/future dates 2016-04-11 09:29:06 +09:30
Daniel O'Connor
3644a8124f Tweak specs, implementation properly 2016-04-09 22:54:03 +09:30
Daniel O'Connor
5cfa051d75 Update expectations 2016-04-09 22:43:17 +09:30
Daniel O'Connor
69fb98146b Adjust logic 2016-04-09 22:01:05 +09:30
Cesy
01b9e76814 Merge pull request #860 from CloCkWeRX/fix_warnings 
Fix WARNING: Using the `raise_error` matcher without providing a specific error
 2016-04-09 13:26:11 +01:00
Cesy
594e3470b4 Merge pull request #858 from CloCkWeRX/fix_plant_parts 
Fix plant parts / harvests issue #853
 2016-04-09 13:25:46 +01:00
Daniel O'Connor
7bb7a18b66 Fixes #850 Refactors percentage grown to model, stops rendering progress bars in situations it doesn't make sense. Adds specs. 2016-04-09 21:45:13 +09:30
Cesy
de4b89fdf7 Merge pull request #861 from hcbviolet/descriptions 
#852 Harvest description headings rendered when there's no description
 2016-04-09 13:08:00 +01:00
hcbviolet
e8d7ed0c2d Edit display_harvest_description method for no description 2016-04-08 17:34:58 -07:00
Daniel O'Connor
a3ad9189b1 Fix WARNING: Using the raise_error matcher without providing a specific error or message risks false positives, since raise_error will match when Ruby raises a NoMethodError, NameError or ArgumentError, potentially allowing the expectation to pass without even executing the method you are intending to call. Actual error raised was #<ActiveRecord::RecordNotFound: Couldn't find Member with 'id'=9999>. Instead consider providing a specific error class or message. This message can be supressed by setting: RSpec::Expectations.configuration.warn_about_potential_false_positives = false. Called from /home/travis/build/Growstuff/growstuff/spec/controllers/member_controller_spec.rb:65:in `block (3 levels) in <top (required)>'. 2016-04-07 10:41:35 +09:30
Daniel O'Connor
da588b7fdb Create the plant part instead of assuming it's seeded 2016-04-07 10:08:21 +09:30
Daniel O'Connor
a7f9e113d6 Target the name attribute 2016-04-07 09:59:06 +09:30
Daniel O'Connor
c3a883de16 Ensure we choose a plant part 2016-04-07 09:47:53 +09:30
Daniel O'Connor
aa2a761a58 Ensure we choose a plant part 2016-04-07 09:46:29 +09:30
Daniel O'Connor
a800630b01 Ensure we choose a plant part 2016-04-07 09:43:45 +09:30
Cesy
b69bb219a3 Merge pull request #859 from CloCkWeRX/add_title_validations 
Add title validations
 2016-04-03 11:45:10 +01:00
Daniel O'Connor
a9330f2d77 #857 Add length validations to UI 2016-04-03 00:15:45 +10:30
Daniel O'Connor
de8bcc38d3 #857 Add length validations to models 2016-04-03 00:13:38 +10:30
Daniel O'Connor
99a3be08eb Fixes #853 2016-04-03 00:08:19 +10:30
Daniel O'Connor
d9f04d1fa9 Fixes #853 2016-04-03 00:08:12 +10:30
pozorvlak
1791ed5b01 Merge pull request #843 from CloCkWeRX/fix_CVE-2015-7551_upgrade_ruby 
Fix CVE-2015-7551
 2016-03-29 20:04:56 +01:00
pozorvlak
683ec9dd9d Merge pull request #842 from CloCkWeRX/cve_2015_5312_and_more 
Fix CVE 2015 5312 and more
 2016-03-29 20:03:41 +01:00
Daniel O'Connor
668f6d3a2b Fix 'app/views/harvests/_form.html.haml:39: warning: duplicated key at line 39 ignored: :class' 2016-03-29 00:43:14 +10:30
Mackenzie
90e9017a19 Merge pull request #841 from CloCkWeRX/fix_840_performance 
Eager load photos to reduce the number of queries executed
 2016-03-28 09:55:40 -04:00
Daniel O'Connor
9f3cb7ee8b Merge branch 'dev' of github.com:Growstuff/growstuff into fix_CVE-2015-7551_upgrade_ruby 2016-03-29 00:24:26 +10:30
Daniel O'Connor
df952a1779 Bump rspec to fix https://github.com/rspec/rspec-rails/issues/1532 2016-03-29 00:00:07 +10:30
Daniel O'Connor
3748f954c5 Name: uglifier 
Version: 2.5.3
Advisory: 126747
Criticality: Unknown
URL: https://github.com/mishoo/UglifyJS2/issues/751
Title: uglifier incorrectly handles non-boolean comparisons during minification
Solution: upgrade to >= 2.7.2
 2016-03-28 23:54:29 +10:30
Mackenzie
dcbacddb58 Merge pull request #839 from CloCkWeRX/tweak_permissions 
Tweak permissions links
 2016-03-28 09:22:35 -04:00
Daniel O'Connor
b0adec20e7 Fix CVE-2015-7551 (https://www.ruby-lang.org/en/news/2015/12/16/unsafe-tainted-string-usage-in-fiddle-and-dl-cve-2015-7551/) 2016-03-28 23:40:17 +10:30
Daniel O'Connor
4e7e82c8a8 Fix CVE-2015-7551 (https://www.ruby-lang.org/en/news/2015/12/16/unsafe-tainted-string-usage-in-fiddle-and-dl-cve-2015-7551/) 2016-03-28 23:39:05 +10:30
Daniel O'Connor
6905cd410d Bump to current ruby 2.2.*, as there's an end of life for 2.1.* https://www.ruby-lang.org/en/news/2016/02/24/support-plan-of-ruby-2-0-0-and-2-1/ 2016-03-28 23:38:25 +10:30
Daniel O'Connor
66bb130a1a Fix CVE-2015-7551 (https://www.ruby-lang.org/en/news/2015/12/16/unsafe-tainted-string-usage-in-fiddle-and-dl-cve-2015-7551/) 2016-03-28 23:33:34 +10:30
Daniel O'Connor
03ae327e30 Name: uglifier 
Version: 2.5.3
Advisory: 126747
Criticality: Unknown
URL: https://github.com/mishoo/UglifyJS2/issues/751
Title: uglifier incorrectly handles non-boolean comparisons during minification
Solution: upgrade to >= 2.7.2
 2016-03-28 23:27:15 +10:30