 Brenda Wallace
|
0db8c2feb2
|
Intentionally making rubocop unhappy
to test travis
|
2017-03-01 20:48:15 +00:00 |
|
|
Brenda Wallace
|
7e06bf4fd0
|
Wrap shell script variables in ""
|
2017-03-01 20:48:15 +00:00 |
|
|
Brenda Wallace
|
dd710860de
|
Run the linters etc from overcommit
|
2017-03-01 20:48:15 +00:00 |
|
|
pozorvlak
|
4718a9edab
|
Merge pull request #1256 from Br3nda/numeric
Rubocop fix for some numerics
|
2017-03-01 13:31:10 +00:00 |
|
|
Brenda Wallace
|
8c5db9229a
|
fixed forced octal
|
2017-03-01 17:49:42 +13:00 |
|
|
Brenda Wallace
|
e229438997
|
rubocop fox for numeric literals
|
2017-03-01 17:46:12 +13:00 |
|
|
Brenda Wallace
|
85a4490740
|
Rubocop fix for unneeded %Q
|
2017-03-01 17:35:06 +13:00 |
|
|
Brenda Wallace
|
9684e84420
|
Moved metrics to bottom of rubocop.yml
Waiting to be completed
|
2017-03-01 11:38:16 +13:00 |
|
|
Brenda Wallace
|
4364c028a2
|
Removed offense counts
|
2017-03-01 11:36:40 +13:00 |
|
|
Brenda Wallace
|
4e44e26c6c
|
Removed rubocop todos that are done
|
2017-03-01 11:24:26 +13:00 |
|
|
Daniel O'Connor
|
b07c033863
|
Merge pull request #1249 from Growstuff/bundle-update-2017-02-28-091217
Bundle Update on 2017-02-28
|
2017-02-28 11:59:57 +10:30 |
|
|
deppbot
|
f167f5cbd4
|
Bundle Update on 2017-02-28
|
2017-02-28 09:12:18 +08:00 |
|
|
pozorvlak
|
7a1b192392
|
Merge pull request #1238 from CloCkWeRX/bundle-update-2017-02-23-1
Upgrade rails, other gems
|
2017-02-27 15:18:43 +00:00 |
|
|
pozorvlak
|
642f371416
|
Merge branch 'dev' into bundle-update-2017-02-23-1
|
2017-02-27 15:01:14 +00:00 |
|
|
pozorvlak
|
f4e2b6e115
|
Merge pull request #1244 from Br3nda/photos-controller
DRY the photos controller
|
2017-02-27 11:26:14 +00:00 |
|
|
Daniel O'Connor
|
1873d28b50
|
Merge branch 'dev' into bundle-update-2017-02-23-1
|
2017-02-27 16:08:50 +10:30 |
|
|
Brenda Wallace
|
ce03b4efde
|
DRY the photos controller
|
2017-02-26 17:03:29 +13:00 |
|
|
Shiny
|
102c113b0c
|
Merge branch 'master' into dev
|
2017-02-25 22:56:23 +13:00 |
|
|
Shiny
|
245cd2e44c
|
Merge branch 'dev' into bundle-update-2017-02-23-1
|
2017-02-25 22:56:01 +13:00 |
|
|
Cesy
|
f28456875b
|
Merge pull request #1242 from Br3nda/schema-update
Schema is out of sync -- fixing
|
2017-02-24 21:15:12 +00:00 |
|
|
Brenda Wallace
|
9604eed2f3
|
Schema is out of sync -- fixing
|
2017-02-24 20:19:01 +13:00 |
|
|
Brenda Wallace
|
4eda3a506b
|
Fix up csv importer, should make duplicates
Now matches the old functionality.
|
2017-02-24 20:08:01 +13:00 |
|
|
Daniel O'Connor
|
14f3dc7526
|
Add explaining notes
|
2017-02-23 14:34:38 +10:30 |
|
|
Daniel O'Connor
|
f2d3c88c85
|
Revert "Upgrade to the 4.x series of d3-rails"
This reverts commit 5bd7d9aa43.
|
2017-02-23 14:33:33 +10:30 |
|
|
Daniel O'Connor
|
f4e0efc8da
|
Update autoprefixer-rails
|
2017-02-23 14:32:47 +10:30 |
|
|
Daniel O'Connor
|
13bfdeaa1a
|
Pin Kaminari for the moment, until https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md#100 assessed
|
2017-02-23 14:31:47 +10:30 |
|
|
Daniel O'Connor
|
e2fb7c940f
|
Upgrade js-routes
|
2017-02-23 14:30:10 +10:30 |
|
|
Daniel O'Connor
|
5bd7d9aa43
|
Upgrade to the 4.x series of d3-rails
|
2017-02-23 14:28:19 +10:30 |
|
|
Daniel O'Connor
|
117c717391
|
Upgrade capybara, codeclimate-test-reporter
|
2017-02-23 14:25:51 +10:30 |
|
|
Daniel O'Connor
|
72603a2db0
|
Pin to specific omniauth versions for the moment, to avoid login test regression
|
2017-02-23 14:24:29 +10:30 |
|
|
Daniel O'Connor
|
9f8cfa8de3
|
Update sexp_processor, ruby-units
|
2017-02-23 14:23:01 +10:30 |
|
|
Daniel O'Connor
|
221dd45681
|
Upgrade to d3 3.5 “Mount Sharp”
|
2017-02-23 14:19:33 +10:30 |
|
|
Daniel O'Connor
|
fb2a600433
|
Pin d3-rails for the moment
|
2017-02-23 14:18:31 +10:30 |
|
|
Daniel O'Connor
|
296f8dddfa
|
Update selenium-webdriver, haml_lint, jasmine
|
2017-02-23 14:15:27 +10:30 |
|
|
Daniel O'Connor
|
da16a38d1f
|
Upgrade rails
|
2017-02-23 14:12:27 +10:30 |
|
|
Brenda Wallace
|
5abc1fb80e
|
duplicate alt name spec (and adding to crop)
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
86d5f5febd
|
sciname/altnames adding code is very similar
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
0a840abc58
|
Added specs for duplicate sci names
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
968e9bd3ad
|
Rubocop fix up in spec
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
ddd0e0c285
|
Fixed typo in string causing spec to fail
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
00952d5ef6
|
Updating more specs for new csv importer interface
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
a0e1d8b11d
|
Update scientific name model spec
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
3d7f2ec20c
|
Updating specs to match new csv importer
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
abbd2cf0a4
|
fix bug: look up parent crop by name in csv import
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
2f9961651f
|
Call new csv importer from specs
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
3089c28233
|
Adding validations to sci names and alt names
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
4e722dd123
|
Move crop csv import to own file
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
5698a78d9b
|
DRY the accounts controller
|
2017-02-23 09:45:57 +13:00 |
|
|
Daniel O'Connor
|
71804a0b41
|
Merge pull request #1235 from Br3nda/accounttypes-controller-DRY
DRY the account types controller
|
2017-02-22 11:03:00 +10:30 |
|
|
Brenda Wallace
|
d500c9093d
|
DRY the account types controller
|
2017-02-22 13:21:59 +13:00 |
|