summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove incorrect text from modal warning21393-allow-deletion-of-protected-branchesSam Rose2017-05-051-2/+0
* Clean up template for Delete protected branch buttonSam Rose2017-05-051-3/+2
* Flash message on protected branch deleteSam Rose2017-05-054-8/+14
* Feature specs for deleting branches and merge originSam Rose2017-05-0511-132/+176
|\
| * Clean up some specs and remove space between word and commaDouwe Maan2017-05-043-38/+28
| * Allow protected branch deletion by owners and masters through the web interfaceDouwe Maan2017-05-0416-147/+221
* | Allow protected branch deletion by owners and masters through the web interfaceDouwe Maan2017-05-0312-50/+153
|/
* Add UI to confirm delete protected branch modalSam Rose2017-05-036-7/+90
* Merge branch 'improve-slack-docs' into 'master' Sean McGivern2017-04-284-66/+40
|\
| * Improve Slack docsVictor Wu2017-04-284-66/+40
|/
* Merge branch '29181-add-more-tests-for-spec-controllers-projects-builds-contr...Rémy Coutable2017-04-2810-20/+496
|\
| * Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"Dosuken shinya2017-04-2810-20/+496
|/
* Merge branch 'make_markdown_tables_thinner' into 'master' Sean McGivern2017-04-285-0/+25
|\
| * Make markdown tables thinnerblackst0ne2017-04-275-0/+25
* | Merge branch 'project-list-alignment' into 'master' Phil Hughes2017-04-281-1/+1
|\ \
| * | Remove top padding on project list rowproject-list-alignmentAnnabel Dunstone Gray2017-04-271-1/+1
* | | Merge branch 'dm-blob-viewers' into 'master' Tim Zallmann2017-04-2871-297/+1773
|\ \ \
| * | | 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