mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-05 07:01:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,231 Commits 65 Branches 76 Tags
fb9a1fdfd33a7f73df3271f95e4e9ad4e7d6a922
Commit Graph

3231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pozorvlak
fb9a1fdfd3 Merge pull request #1061 from Br3nda/bw/long-lines-fixed 
Wrapped all lines > 120 chars.
 2016-11-25 18:02:22 +00:00
Brenda Wallace
be67b858b4 Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed 
Conflicts:
	lib/tasks/growstuff.rake
 2016-11-25 08:18:18 +13:00
Miles Gould
a796ba904a Merge branch 'Br3nda-bw/reduce-complexity' into dev 2016-11-24 19:06:31 +00:00
Miles Gould
012f2f0cfa Merge branch 'bw/reduce-complexity' of https://github.com/Br3nda/growstuff into Br3nda-bw/reduce-complexity 2016-11-24 19:00:06 +00:00
pozorvlak
3e8c61c0c3 Merge pull request #1064 from Br3nda/bw/normalise-translations 
Normalise translation file
 2016-11-24 18:55:10 +00:00
Daniel O'Connor
916fd73071 Merge pull request #1065 from Br3nda/bw/removed-some-duplication 
Reduced code duplication in growstuff.rake
 2016-11-23 18:11:34 +10:30
Brenda Wallace
18a8d6c5bf Re-instate usage info when args not as expected 2016-11-23 20:38:46 +13:00
Brenda Wallace
37d01e831f Reduced code duplication in growstuff.rake 2016-11-23 20:27:20 +13:00
Brenda Wallace
975deab4b2 Normalise translation file 2016-11-23 20:24:02 +13:00
Brenda Wallace
fb6f1ac0a8 Changed whitelisting of what can have photos 2016-11-21 10:05:52 +13:00
Brenda Wallace
069343803e List of types that can have photos in own method 2016-11-20 21:46:58 +13:00
Brenda Wallace
36d38fe624 Turn off frozen literals requirement 2016-11-20 21:39:51 +13:00
Brenda Wallace
0d6680f574 Disabling rails-pos-args, and documentation 
in rubocop
 2016-11-20 21:37:10 +13:00
Brenda Wallace
dac2343b68 Further code duplication reduction 2016-11-20 21:18:07 +13:00
Brenda Wallace
f24e02fd11 reduced code duplication again in photos cont spec 2016-11-20 21:13:57 +13:00
Brenda Wallace
dddc7b020d Corrected description in spec 2016-11-20 21:13:33 +13:00
Brenda Wallace
12a9a0b97d one more check no alert was generated 2016-11-20 21:13:08 +13:00
Brenda Wallace
6a8f48693b Reduce code duplication in photos cont spec 2016-11-20 21:12:43 +13:00
Brenda Wallace
50a0668c1d Check no alert message was generated 2016-11-20 21:11:54 +13:00
Brenda Wallace
a7e88a55b3 Spec for trying to attach photo when not allowed. 2016-11-20 21:03:08 +13:00
Brenda Wallace
8012d9f6a8 Whitelist which items can have photos 2016-11-20 21:02:43 +13:00
Brenda Wallace
73a050df13 before_filter becomes before_action 
in photos controller
 2016-11-20 20:29:45 +13:00
Brenda Wallace
d0a1a113b6 Multi-line block changed from {} to do end 2016-11-20 20:29:01 +13:00
Brenda Wallace
a8bffd3bce White space fix in spec 2016-11-20 20:28:34 +13:00
Brenda Wallace
f6aac07c3d Flatten params passed in photos controller spec 2016-11-20 20:27:59 +13:00
Brenda Wallace
72f1d83af4 Removed a bunch of blank lines 2016-11-20 20:19:14 +13:00
Brenda Wallace
138080c4d4 Tabulation fix 2016-11-20 20:18:20 +13:00
Brenda Wallace
cf70bfebe9 Further simplified photos controller 2016-11-20 20:17:27 +13:00
Brenda Wallace
5fc1ab9c60 Reduced code duplication in growstuff.rake 2016-11-20 19:35:17 +13:00
Brenda Wallace
6078734136 Merge remote-tracking branch 'upstream/dev' into bw/reduce-complexity 2016-11-20 19:25:30 +13:00
Brenda Wallace
917e33bccf Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed 2016-11-20 19:24:53 +13:00
Mackenzie
6a8b604554 Merge pull request #1063 from Br3nda/use_phantomjs_211_in_travis 
Use phantomjs 211 in travis
 2016-11-19 23:57:25 -05:00
Miles Gould
2fa282e131 Install PhantomJS 2.1.1 on Travis-CI 
I've found it to be much more stable locally - hopefully it will help
with our flaky CI issues (#901).

Code mostly cargo-culted from
9d3afe3d04
 2016-11-20 17:22:05 +13:00
Brenda Wallace
810fe14c69 Highest percieved complexity is now 10 2016-11-20 09:17:42 +13:00
Brenda Wallace
f4a26d0580 has_item_id? renamed to item_id? 2016-11-20 09:06:04 +13:00
Brenda Wallace
0a54c2d986 Moved to method: collection to use for photos 2016-11-20 09:05:29 +13:00
Brenda Wallace
9c4f011fbc Reduced percieved complexity in photos_controller.rb 2016-11-19 22:28:38 +13:00
Brenda Wallace
951727e266 Removed offense count comment from rubocop.yml - has fixed 2016-11-19 13:58:45 +13:00
pozorvlak
7355061762 Merge pull request #1060 from Br3nda/bw/covert-tabs-to-spaces 
Covert all tabs to spaces
 2016-11-18 13:39:35 +00:00
Brenda Wallace
2872a1c29d Wrapped all long lines. 
reduced rubocop's line length limit to 120
 2016-11-17 22:02:18 +13:00
Brenda Wallace
fd29a94d6e Whitespace fixes in Gemfile 2016-11-17 21:52:52 +13:00
Brenda Wallace
5e0cff5b8e Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces 
Conflicts:
	app/helpers/seeds_helper.rb
	spec/support/controller_macros.rb
 2016-11-17 19:04:44 +13:00
Daniel O'Connor
b3ae03ab7e Merge pull request #1059 from Br3nda/bw/trailing-whitespace-begone 
Removed all trailing white space
 2016-11-16 14:34:49 +10:30
Brenda Wallace
5ec2877577 Covert all tabs to spaces 2016-11-16 13:18:26 +13:00
Brenda Wallace
e182247774 Removed the ignores for trailing whitespace 2016-11-16 13:09:04 +13:00
Brenda Wallace
6bd9bd98d9 Removed extra blank lines, & added a end of file 2016-11-16 12:52:48 +13:00
Brenda Wallace
0475954acf Removed extra blank lines 2016-11-16 12:50:14 +13:00
Brenda Wallace
0d371593fb Merge remote-tracking branch 'upstream/dev' into bw/trailing-whitespace-begone 2016-11-15 03:25:14 +00:00
Daniel O'Connor
a6ef100e02 Merge pull request #1058 from Br3nda/bw/wiki-link-text-dupe 
Removed duplicate wiki_linktext
 2016-11-14 18:20:17 +10:30
Mackenzie
adc34b76da Merge pull request #1055 from Br3nda/bw/rubocop-ci 
Add rubocop to travis ci
 2016-11-13 23:10:00 -05:00