summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '21275-getting-500-error-when-viewing-a-merge-request'Douwe Maan2016-08-254-2/+34
|\
| * Update CHANGELOG21275-getting-500-error-when-viewing-a-merge-requestSean McGivern2016-08-251-0/+4
| * Don't show conflicts when there are noneSean McGivern2016-08-252-1/+11
| * Handle case where conflicts aren't on disk yetSean McGivern2016-08-253-1/+19
* | Merge branch '19730-mark-as-done' into 'master' Robert Speicher2016-08-253-1/+44
|\ \
| * | Add specs to ensure a successful return 19730-mark-as-donePaco Guzman2016-08-253-1/+44
* | | Merge branch 'statuseable-hasstatus' into 'master' Robert Speicher2016-08-255-7/+7
|\ \ \
| * | | rename Statuseable to HasStatusDe Wet Blomerus2016-08-255-7/+7
| |/ /
* | | Merge branch '21257-label-lists-should-shows-opened-or-closed-issues-with-tha...Robert Speicher2016-08-254-11/+18
|\ \ \
| * | | Update CHANGELOG21257-label-lists-should-shows-opened-or-closed-issues-with-that-labelDouglas Barbosa Alexandre2016-08-251-2/+5
| * | | Update Issue board documentationDouglas Barbosa Alexandre2016-08-251-4/+3
| * | | Label list shows all issues (opened or closed) with that labelDouglas Barbosa Alexandre2016-08-252-5/+10
| | |/ | |/|
* | | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-2519-339/+12
|\ \ \
| * | | Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-2519-339/+12
* | | | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-2525-124/+568
|\ \ \ \
| * | | | Change the way merge request diff compare worksdz-merge-request-versionDmitriy Zaporozhets2016-08-251-18/+6
| * | | | Make it more obvious when the user isn't currently viewing the latest mr versionDmitriy Zaporozhets2016-08-251-0/+4
| * | | | Add code improvements to merge request version featureDmitriy Zaporozhets2016-08-254-11/+19
| * | | | Add changelog item for merge request versions featureDmitriy Zaporozhets2016-08-221-0/+3
| * | | | Fix db schema via db:migrate:resetDmitriy Zaporozhets2016-08-221-18/+16
| * | | | Disable comments on older merge request diffDmitriy Zaporozhets2016-08-221-0/+5
| * | | | Fix merge request diff cache service specDmitriy Zaporozhets2016-08-221-1/+1
| * | | | Fix merge request diff apiDmitriy Zaporozhets2016-08-221-1/+1
| * | | | Restore diff_sha_refs methodDmitriy Zaporozhets2016-08-223-19/+24
| * | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-22211-563/+2637
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-19554-1654/+32323
| |\ \ \ \ \
| * | | | | | Fix merge request versions api docDmitriy Zaporozhets2016-08-191-2/+2
| * | | | | | Make sure merge request is fetched before collecting base sha in merge reques...Dmitriy Zaporozhets2016-08-191-0/+1
| * | | | | | Fix merge request diffs specDmitriy Zaporozhets2016-08-151-1/+1
| * | | | | | Fix and refactor merge request diff_refs methodDmitriy Zaporozhets2016-08-154-27/+11
| * | | | | | Make merge request diff works with new FileCollection logicDmitriy Zaporozhets2016-08-155-17/+22
| * | | | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-15727-8015/+12194
| |\ \ \ \ \ \
| * | | | | | | Fix merge request diff create and head_commit_sha compatibilityDmitriy Zaporozhets2016-08-151-3/+14
| * | | | | | | Change the way old merge request diff handledDmitriy Zaporozhets2016-08-152-12/+19
| * | | | | | | Add documentation for merge request versionsDmitriy Zaporozhets2016-08-122-0/+8
| * | | | | | | Add single merge request diff API endpointDmitriy Zaporozhets2016-08-124-29/+81
| * | | | | | | Remove unnecessary   in merge request versions dropdownDmitriy Zaporozhets2016-08-121-1/+1
| * | | | | | | Load merge request versions without loading whole diff from databaseDmitriy Zaporozhets2016-08-092-4/+8
| * | | | | | | Add MergeRequest#branch_merge_base_commit methodDmitriy Zaporozhets2016-08-082-8/+44
| * | | | | | | Fix project id param for merge request version APIDmitriy Zaporozhets2016-08-032-3/+3
| * | | | | | | Update merge request versions API to match styleguideDmitriy Zaporozhets2016-08-032-12/+18
| * | | | | | | Add API to list merge request diff versionsDmitriy Zaporozhets2016-08-035-0/+159
| * | | | | | | Fix merge request spec for update diff noteDmitriy Zaporozhets2016-08-021-0/+2
| * | | | | | | Build diff_refs for merge request if merge request diff does not existDmitriy Zaporozhets2016-08-021-0/+6
| * | | | | | | Fix creation and reload of the merge request diffDmitriy Zaporozhets2016-08-021-2/+12
| * | | | | | | Chnage the way how merge request diff is initialized and savedDmitriy Zaporozhets2016-08-027-52/+44
| * | | | | | | Change merge request diff creation from callback to part of the serviceDmitriy Zaporozhets2016-08-025-7/+9
| * | | | | | | Add more tests to merge_request_diff and improve initializeDmitriy Zaporozhets2016-08-023-4/+21
| * | | | | | | Refactor MergeRequestDiff initialize methodDmitriy Zaporozhets2016-08-022-17/+12
| * | | | | | | Reload merge request association reload when update codeDmitriy Zaporozhets2016-08-022-10/+4
View Lorry Controller Status