summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use new renamed markup methoddm-blob-viewersDouwe Maan2017-04-272-1/+3
|
* Add variable to save us a double lookupDouwe Maan2017-04-271-2/+3
|
* Fix typoDouwe Maan2017-04-271-1/+1
|
* Address feedbackDouwe Maan2017-04-277-44/+53
|
* Explain BlobViewer::Base#render_errorDouwe Maan2017-04-272-0/+16
|
* Explain how viewers are selected from RICH_VIEWERSDouwe Maan2017-04-272-13/+28
|
* Added specs for JS method to switch viewsPhil Hughes2017-04-271-2/+39
|
* Fixed failing JS testsPhil Hughes2017-04-272-4/+8
|
* Satisfy RubocopDouwe Maan2017-04-272-2/+0
|
* Add changelogDouwe Maan2017-04-271-0/+5
|
* Add specsDouwe Maan2017-04-2712-51/+904
|
* Small code tweaksDouwe Maan2017-04-272-16/+18
|
* Set BlobViewer::Base.binary instead of .textDouwe Maan2017-04-2712-17/+17
|
* Add BlobViewer::Base#binary? methodDouwe Maan2017-04-272-22/+30
|
* Blob responds to text?Douwe Maan2017-04-271-1/+1
|
* Refactor overriding max sizeDouwe Maan2017-04-277-26/+32
|
* Render viewer error synchronously so that 'view the source' link will workDouwe Maan2017-04-2712-44/+41
|
* Address feedbackDouwe Maan2017-04-276-23/+29
|
* Add test stubsDouwe Maan2017-04-278-193/+33
|
* Fix feature specsDouwe Maan2017-04-275-2/+28
|
* Fix some specsDouwe Maan2017-04-275-9/+7
|
* Satisfy eslintDouwe Maan2017-04-271-18/+7
|
* Download blob viewer is client-sideDouwe Maan2017-04-272-2/+4
|
* Add specsDouwe Maan2017-04-273-13/+191
|
* Add BlobViewer JSDouwe Maan2017-04-273-0/+135
|
* Allow LineHighlighter to be triggered by eventDouwe Maan2017-04-271-7/+13
|
* Add JSON endpoint to get simple blob viewerDouwe Maan2017-04-272-2/+30
|
* Add viewer switcherDouwe Maan2017-04-272-0/+14
|
* Render blob viewer errorDouwe Maan2017-04-273-5/+25
|
* Render blob using blob viewersDouwe Maan2017-04-274-6/+22
|
* Move conditional inside copy_blob_source_buttonDouwe Maan2017-04-272-4/+4
|
* Use Blob methods instead of BlobHelper helpersDouwe Maan2017-04-277-27/+11
|
* Add rich blob viewersDouwe Maan2017-04-2721-18/+139
|
* Add simple blob viewersDouwe Maan2017-04-2710-9/+66
|
* Refactor Blob and add BlobViewer::BaseDouwe Maan2017-04-272-56/+151
|
* Pass project to BlobDouwe Maan2017-04-274-5/+13
|
* Merge branch 'gitter-badge' into 'master' Douwe Maan2017-04-271-0/+1
|\ | | | | | | | | gitter badge in the readme pointing to gitlabhq/gitlabhq See merge request !10968
| * gitter badge in the readme pointing to gitlabhq/gitlabhqJob van der Voort2017-04-271-0/+1
| |
* | Merge branch 'remove-invalid-services' into 'master' Douwe Maan2017-04-277-24/+51
|\ \ | | | | | | | | | | | | Remove invalid services with nil or empty type See merge request !10847
| * | tadds migration to remove invalid servicesTiago Botelho2017-04-276-25/+47
| | |
| * | remove invalid servicesTiago Botelho2017-04-262-0/+5
| | |
* | | Merge branch ↵Sean McGivern2017-04-273-1/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized' into 'master' Resolve "Milestone sidebar display incorect number of MR when minimized" Closes #31292 See merge request !10933
| * | | [ci skip] added changelogLuke "Jared" Bennett2017-04-271-0/+4
| | | |
| * | | Added test31292-milestone-sidebar-display-incorect-number-of-mr-when-minimizedLuke "Jared" Bennett2017-04-261-0/+24
| | | |
| * | | Correct the resource counted for MR collapsed infoLuke "Jared" Bennett2017-04-261-1/+1
| | | |
* | | | Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-275-7/+73
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ordering of commits in the network graph. Closes #30973 See merge request !10936
| * | | | Add CHANGELOG entry for !1093630973-fix-network-graph-orderingTimothy Andrew2017-04-271-0/+4
| | | | |
| * | | | Fix ordering of commits in the network graph.Timothy Andrew2017-04-274-7/+69
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We upgraded `rugged` to 0.25.1.1 in !10286 for %9.1 - Prior to this upgrade, the default sort order for commits returned by `Gitlab::Git::Repository#find_commits` was `Rugged::SORT_DATE`, which the graph relied on. - While upgrading `rugged`, the MR also changed this default to `Rugged::SORT_NONE`, which broke commit ordering in the graph. - This commit adds an option to `Gitlab::Git::Repository#find_commits` to sort by date, and changes the graph builder `Network::Graph` so it explictly requests the `:date` sort order
* | | | Merge branch '2246-uuid-is-nil-for-new-installation' into 'master' Sean McGivern2017-04-275-1/+25
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Lazily set UUID in ApplicationSetting for new installations Closes gitlab-ee#2246 See merge request !10893
| * | | Fill missing uuid on the application_settings table2246-uuid-is-nil-for-new-installationDouglas Barbosa Alexandre2017-04-262-1/+11
| | | |
View Lorry Controller Status