Miles Gould
844f68ef4c
Auto-deploy to production on successful merge
...
I *think* this is all that's necessary, though it's a bit hard to test
:-)
2016-11-24 18:48:01 +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
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
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
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
Brenda Wallace
a91c785543
Moved metrics placeholders to main rubocop.yml file
2016-11-14 16:51:17 +13:00
Brenda Wallace
1cac58dadc
Allow both " and ' quote styles
2016-11-14 16:49:26 +13:00
Brenda Wallace
510c31f669
Removed 3 blank lines that codeclimate didn't like
2016-11-14 15:10:13 +13:00
Brenda Wallace
bdb057ca0f
Removed all trailing white space
2016-11-14 15:05:32 +13:00
Brenda Wallace
dc5d7a8677
Removed duplicate wiki_linktext
2016-11-14 14:30:45 +13:00
Brenda Wallace
1fc1c64f62
Ignore rubocop_todo filename in code climate
2016-11-13 17:42:35 +13:00
Brenda Wallace
d49f33476d
Merge remote-tracking branch 'upstream/dev' into bw/rubocop-ci
2016-11-13 16:45:10 +13:00
Mackenzie
2260f56713
Merge pull request #1056 from Br3nda/bw/contributors-case
...
Contributors check case-insentive
2016-11-12 18:39:18 -05:00
Brenda Wallace
eecd54c5ea
Use single quotes, as code climate suggests
2016-11-13 11:12:24 +13:00
Brenda Wallace
e1f0b649f5
if! -> unless, as code climate suggests
2016-11-13 11:10:45 +13:00
Brenda Wallace
9605ec6109
Pass args to system() to be escaped
2016-11-13 11:07:57 +13:00
Brenda Wallace
b2977d6806
Search contributors file, case insensitive.
2016-11-13 11:05:43 +13:00
Brenda Wallace
d091aecaf1
Use https for contributor link
...
Hoping this will fix the failing contributor error
2016-11-13 10:46:46 +13:00
Brenda Wallace
97f0d5fc5d
Add vendor to rubocop exclude path
2016-11-13 10:34:57 +13:00
Brenda Wallace
2bc9b8c8bb
Added rubocop check to travisci
2016-11-13 10:20:13 +13:00
Brenda Wallace
e312ee2773
All existing rubocop offfenses in a todo file
2016-11-13 10:20:00 +13:00
Brenda Wallace
c685b970d3
Add rubocop to bundle
...
So we can manage which version of rubocop to use.
2016-11-13 10:07:41 +13:00
Cesy
621b7e5d29
Merge pull request #1048 from pozorvlak/es_factorygirl_weirdness
...
Prevent FactoryGirl from trying to connect to ElasticSearch in tests
2016-10-11 08:58:32 +02:00
Cesy
b59ebb7d52
Merge pull request #984 from maco/rubocop_config
...
Rubocop config (ignore the red x)
2016-10-09 17:28:47 +01:00
Miles Gould
ce2141ddb7
Only initialise Crop.__elasticsearch__ if needed
...
The mere presence of this field was causing any test that ran
`FactoryGirl.create :alternate_name` to try to connect to an
ElasticSearch server, even if GROWSTUFF_ELASTICSEARCH was false.
Fixes #1047
2016-10-07 14:49:09 +01:00
Miles Gould
36c88c3762
Delete trailing whitespace
2016-10-07 14:48:38 +01:00
Mackenzie Morgan
099b399b24
bundle
2016-10-06 22:00:01 -04:00
Mackenzie Morgan
5092c78fba
merge
2016-10-06 21:48:18 -04:00
Cesy
199cdf20a7
Merge pull request #1045 from Br3nda/bw/harvest-link
...
harvest thumbnail title linking to the harvest itself
2016-09-25 10:21:59 +01:00
Brenda Wallace
7c1040e7aa
Corrected contributor name
2016-09-19 21:51:13 +12:00
Brenda Wallace
faf117b002
test for link to member's harvest
2016-09-19 18:02:44 +12:00
Brenda Wallace
13e491cda7
harvest thumbnail title linking to the harvest itself
2016-09-18 18:33:28 +12:00
Cesy
286b7118be
Merge pull request #1041 from CloCkWeRX/openfarm-links
...
Add links to OpenFarm
2016-09-15 11:31:13 +01:00
Cesy
b2dfe31b5c
Merge pull request #1043 from CloCkWeRX/fix_1042
...
Fix map token in prod configuration
2016-09-15 09:09:02 +01:00
Daniel O'Connor
1f005a3d42
Fixes #1042
2016-09-14 21:41:18 +09:30
Daniel O'Connor
36c64bd8dc
#1038 Add links to OpenFarm
2016-09-14 14:57:08 +09:30
Daniel O'Connor
277325d58c
Merge pull request #1036 from Br3nda/bw/json-sessions
...
allow registration and signin/out on the API
2016-09-14 14:50:04 +09:30
Brenda Wallace
370f407ad6
Adding Brenda Wallace to contributors
2016-09-13 19:25:22 +12:00
Daniel O'Connor
3ea8e2294e
Update README.md
...
Fixes #1037
2016-09-12 21:57:27 +09:30
