Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b713fff00d7c1a6c50e72f69647a6b5cbe3629dd https://github.com/galaxyproject/galaxy/commit/b713fff00d7c1a6c50e72f69647a6... Author: Eric Enns eric.enns@phac-aspc.gc.ca Date: 2016-06-26 (Sun, 26 Jun 2016)

Changed paths: M lib/galaxy/datatypes/data.py

Log Message: ----------- Fix off by one error, causing only first line of file to be rendered in peek.

Commit: 997fa1577b19d9daa31768731e7cd5f4a19db1e6 https://github.com/galaxyproject/galaxy/commit/997fa1577b19d9daa31768731e7cd... Author: Eric Enns eric.enns@phac-aspc.gc.ca Date: 2016-06-26 (Sun, 26 Jun 2016)

Changed paths: M lib/galaxy/datatypes/data.py A test/unit/datatypes/test_data.py

Log Message: ----------- Fixed to only line_count not line_count + 1 lines and added in really basic test

Commit: 157da746d8c5da8985d71fee578ba68dc104a11f https://github.com/galaxyproject/galaxy/commit/157da746d8c5da8985d71fee578ba... Author: Eric Enns eric.enns@phac-aspc.gc.ca Date: 2016-06-26 (Sun, 26 Jun 2016)

Changed paths: M lib/galaxy/datatypes/data.py

Log Message: ----------- Fixed E226

Commit: a68381777df3e6c8165f5b9bdc4d4abf9bee41db https://github.com/galaxyproject/galaxy/commit/a68381777df3e6c8165f5b9bdc4d4... Author: Eric Enns eric.enns@phac-aspc.gc.ca Date: 2016-06-26 (Sun, 26 Jun 2016)

Changed paths: M test/unit/datatypes/test_data.py

Log Message: ----------- Fixed E302

Commit: 10ac6ee132642e19b8bf0bd60903a85336337571 https://github.com/galaxyproject/galaxy/commit/10ac6ee132642e19b8bf0bd60903a... Author: Carl Eberhard carlfeberhard@users.noreply.github.com Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M lib/galaxy/datatypes/data.py A test/unit/datatypes/test_data.py

Log Message: ----------- Merge pull request #2556 from ericenns/fix-2461-dataset-peek

[16.04] Fix off by one error, causing only first line of file to be rendered …

Commit: 1e36eba631b2d5bb697dac8b2a7aae375dbe1fe3 https://github.com/galaxyproject/galaxy/commit/1e36eba631b2d5bb697dac8b2a7aa... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-07-19 (Tue, 19 Jul 2016)

Changed paths: M lib/galaxy/datatypes/data.py A test/unit/datatypes/test_data.py

Log Message: ----------- Merge branch 'release_16.04' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/e1e0a3ba10a9...1e36eba631b2