summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '21275-getting-500-error-when-viewing-a-merge-request'Douwe Maan2016-08-251-2/+6
|\
| * Don't show conflicts when there are noneSean McGivern2016-08-251-1/+5
| * Handle case where conflicts aren't on disk yetSean McGivern2016-08-251-1/+1
* | Merge branch '19730-mark-as-done' into 'master' Robert Speicher2016-08-251-1/+2
|\ \
| * | Add specs to ensure a successful return 19730-mark-as-donePaco Guzman2016-08-251-1/+2
| |/
* | Merge branch 'statuseable-hasstatus' into 'master' Robert Speicher2016-08-254-4/+4
|\ \
| * | rename Statuseable to HasStatusDe Wet Blomerus2016-08-254-4/+4
| |/
* | Merge branch '21257-label-lists-should-shows-opened-or-closed-issues-with-tha...Robert Speicher2016-08-251-1/+6
|\ \
| * | Label list shows all issues (opened or closed) with that labelDouglas Barbosa Alexandre2016-08-251-1/+6
| |/
* | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-256-131/+2
|\ \
| * | Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-256-131/+2
| |/
* | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-257-96/+195
|\ \
| * | 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-253-11/+10
| * | Disable comments on older merge request diffDmitriy Zaporozhets2016-08-221-0/+5
| * | Restore diff_sha_refs methodDmitriy Zaporozhets2016-08-222-16/+21
| * | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-22120-293/+846
| |\ \
| * \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-19275-870/+7143
| |\ \ \
| * | | | Make sure merge request is fetched before collecting base sha in merge reques...Dmitriy Zaporozhets2016-08-191-0/+1
| * | | | Fix and refactor merge request diff_refs methodDmitriy Zaporozhets2016-08-153-21/+4
| * | | | Make merge request diff works with new FileCollection logicDmitriy Zaporozhets2016-08-154-9/+14
| * | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-15193-1392/+2001
| |\ \ \ \
| * | | | | 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
| * | | | | 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-081-8/+27
| * | | | | 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-023-33/+37
| * | | | | Change merge request diff creation from callback to part of the serviceDmitriy Zaporozhets2016-08-023-6/+1
| * | | | | Add more tests to merge_request_diff and improve initializeDmitriy Zaporozhets2016-08-022-4/+4
| * | | | | Refactor MergeRequestDiff initialize methodDmitriy Zaporozhets2016-08-021-16/+12
| * | | | | Reload merge request association reload when update codeDmitriy Zaporozhets2016-08-021-7/+2
| * | | | | Remove requirement for base_commit_sha to allow creation of merge requests fo...Dmitriy Zaporozhets2016-08-021-3/+2
| * | | | | Add improvements to merge request versionsDmitriy Zaporozhets2016-08-022-2/+5
| * | | | | Ensure merge request is created with valid diff objectDmitriy Zaporozhets2016-08-022-20/+28
| * | | | | Refactor MergeRequestDiff modelDmitriy Zaporozhets2016-08-021-15/+17
| * | | | | Refactor merge request diffDmitriy Zaporozhets2016-08-021-51/+38
| * | | | | Add small visual improvements to merge request version switchDmitriy Zaporozhets2016-08-022-4/+11
| * | | | | Improve merge request version switcherDmitriy Zaporozhets2016-08-023-9/+27
| * | | | | Add ability to render different merge request versionsDmitriy Zaporozhets2016-08-024-3/+38
| * | | | | Improve merge request diff creation and update testsDmitriy Zaporozhets2016-08-021-5/+1
| * | | | | Create merge request diff on merge request creationDmitriy Zaporozhets2016-08-021-0/+4
| * | | | | Create new version of merge request diff on push instead of updating existing...Dmitriy Zaporozhets2016-08-021-3/+8
* | | | | | Merge branch '21378-error-500-after-8-11-update-on-system-infos-page' into 'm...Robert Speicher2016-08-252-8/+12
|\ \ \ \ \ \
| * | | | | | Use icon helper21378-error-500-after-8-11-update-on-system-infos-pageSean McGivern2016-08-251-2/+2
| * | | | | | Handle unavailable system infoSean McGivern2016-08-252-8/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'standardize-cookie-paths' into 'master' Jacob Schatz2016-08-256-13/+8
|\ \ \ \ \ \
View Lorry Controller Status