summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-...Robert Speicher2016-08-253-2/+9
|\
| * Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-253-2/+9
* | Merge branch '21275-getting-500-error-when-viewing-a-merge-request'Douwe Maan2016-08-251-0/+13
|\ \
| * | Don't show conflicts when there are noneSean McGivern2016-08-251-0/+6
| * | Handle case where conflicts aren't on disk yetSean McGivern2016-08-251-0/+7
| |/
* | Merge branch '19730-mark-as-done' into 'master' Robert Speicher2016-08-252-0/+42
|\ \
| * | Add specs to ensure a successful return 19730-mark-as-donePaco Guzman2016-08-252-0/+42
| |/
* | Merge branch 'statuseable-hasstatus' into 'master' Robert Speicher2016-08-251-3/+3
|\ \
| * | rename Statuseable to HasStatusDe Wet Blomerus2016-08-251-3/+3
| |/
* | Merge branch '21257-label-lists-should-shows-opened-or-closed-issues-with-tha...Robert Speicher2016-08-251-4/+4
|\ \
| * | Label list shows all issues (opened or closed) with that labelDouglas Barbosa Alexandre2016-08-251-4/+4
| |/
* | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-252-95/+0
|\ \
| * | Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-252-95/+0
| |/
* | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-255-14/+143
|\ \
| * | Add code improvements to merge request version featureDmitriy Zaporozhets2016-08-251-0/+9
| * | Fix merge request diff cache service specDmitriy Zaporozhets2016-08-221-1/+1
| * | Restore diff_sha_refs methodDmitriy Zaporozhets2016-08-221-3/+3
| * | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-2243-183/+1173
| |\ \
| * \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-19163-479/+9523
| |\ \ \
| * | | | Fix merge request diffs specDmitriy Zaporozhets2016-08-151-1/+1
| * | | | Fix and refactor merge request diff_refs methodDmitriy Zaporozhets2016-08-151-6/+7
| * | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-15285-3193/+5222
| |\ \ \ \
| * | | | | Add single merge request diff API endpointDmitriy Zaporozhets2016-08-121-0/+17
| * | | | | Add MergeRequest#branch_merge_base_commit methodDmitriy Zaporozhets2016-08-081-0/+17
| * | | | | Add API to list merge request diff versionsDmitriy Zaporozhets2016-08-031-0/+32
| * | | | | Fix merge request spec for update diff noteDmitriy Zaporozhets2016-08-021-0/+2
| * | | | | Chnage the way how merge request diff is initialized and savedDmitriy Zaporozhets2016-08-022-15/+3
| * | | | | Change merge request diff creation from callback to part of the serviceDmitriy Zaporozhets2016-08-022-1/+8
| * | | | | Add more tests to merge_request_diff and improve initializeDmitriy Zaporozhets2016-08-021-0/+17
| * | | | | Refactor MergeRequestDiff initialize methodDmitriy Zaporozhets2016-08-021-1/+0
| * | | | | Reload merge request association reload when update codeDmitriy Zaporozhets2016-08-021-3/+2
| * | | | | Add feature test for merge request versionDmitriy Zaporozhets2016-08-021-0/+38
| * | | | | Improve merge request diff creation and update testsDmitriy Zaporozhets2016-08-021-12/+16
* | | | | | Merge branch '21378-error-500-after-8-11-update-on-system-infos-page' into 'm...Robert Speicher2016-08-251-5/+42
|\ \ \ \ \ \
| * | | | | | Handle unavailable system infoSean McGivern2016-08-251-5/+42
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'standardize-cookie-paths' into 'master' Jacob Schatz2016-08-251-2/+30
|\ \ \ \ \ \
| * | | | | | use gitlab global root url as canonical base url for all javascript set cooki...Mike Greiling2016-08-241-2/+30
| |/ / / / /
* | | | | | Adds response mime type to transaction metric action when it's not HTMLPaco Guzman2016-08-251-4/+17
* | | | | | Display project icon from default branchHannes Rosenögger2016-08-251-0/+31
|/ / / / /
* | | | | Merge branch 'internal_recovery_api' into 'master' Robert Speicher2016-08-241-0/+62
|\ \ \ \ \
| * | | | | Add two factor recovery endpoint to internal APIDrew Blessing2016-08-241-0/+62
* | | | | | Merge branch 'add-sentry-logging-to-api' into 'master' Robert Speicher2016-08-241-0/+27
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add Sentry logging to API callsadd-sentry-logging-to-apiStan Hu2016-08-241-0/+27
* | | | | | Merge branch 'github-importer' into 'master' Douwe Maan2016-08-242-1/+142
|\ \ \ \ \ \
| * | | | | | Add readable error message when remote data could not be fully importedDouglas Barbosa Alexandre2016-08-241-10/+13
| * | | | | | Does not halt the GitHub import process when an error occursDouglas Barbosa Alexandre2016-08-242-1/+139
* | | | | | | Merge branch 'restore-get_id' into 'master' Douwe Maan2016-08-241-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Add failing test for #21334winniehell2016-08-241-0/+10
| |/ / / / / /
* | | | | | | Merge branch 'api_only_allow_merge_if_build_succeeds' into 'master' Douwe Maan2016-08-242-2/+28
|\ \ \ \ \ \ \
| * | | | | | | expose 'only_allow_merge_if_build_succeeds' project setting in the APIMarc Dequènes (Duck)2016-08-242-2/+28
| |/ / / / / /