summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'reduce-contributions-calendar-payload' into 'master' Jacob Schatz2016-08-261-1/+0
|\
| * Reduce contributions calendar data payloadClement Ho2016-08-251-1/+0
* | Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-...Robert Speicher2016-08-251-0/+9
|\ \
| * | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-251-0/+9
* | | Merge branch '21275-getting-500-error-when-viewing-a-merge-request'Douwe Maan2016-08-251-0/+11
|\ \ \
| * | | Handle case where conflicts aren't on disk yetSean McGivern2016-08-251-0/+11
| |/ /
* | | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-256-104/+7
|\ \ \
| * | | Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-256-104/+7
| |/ /
* | | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-254-8/+67
|\ \ \
| * | | Fix merge request diff apiDmitriy Zaporozhets2016-08-221-1/+1
| * | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-228-22/+30
| |\ \ \
| * \ \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1951-201/+1507
| |\ \ \ \
| * | | | | Make merge request diff works with new FileCollection logicDmitriy Zaporozhets2016-08-151-8/+8
| * | | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1572-1223/+979
| |\ \ \ \ \
| * | | | | | Add single merge request diff API endpointDmitriy Zaporozhets2016-08-122-0/+21
| * | | | | | Fix project id param for merge request version APIDmitriy Zaporozhets2016-08-031-2/+2
| * | | | | | Update merge request versions API to match styleguideDmitriy Zaporozhets2016-08-031-9/+10
| * | | | | | Add API to list merge request diff versionsDmitriy Zaporozhets2016-08-033-0/+37
* | | | | | | Adds response mime type to transaction metric action when it's not HTMLPaco Guzman2016-08-251-2/+20
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'internal_recovery_api' into 'master' Robert Speicher2016-08-241-0/+25
|\ \ \ \ \ \
| * | | | | | Add two factor recovery endpoint to internal APIDrew Blessing2016-08-241-0/+25
* | | | | | | Merge branch 'add-sentry-logging-to-api' into 'master' Robert Speicher2016-08-243-20/+36
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add Sentry logging to API callsadd-sentry-logging-to-apiStan Hu2016-08-243-20/+36
* | | | | | | Merge branch 'github-importer' into 'master' Douwe Maan2016-08-242-33/+58
|\ \ \ \ \ \ \
| * | | | | | | Add readable error message when remote data could not be fully importedDouglas Barbosa Alexandre2016-08-241-1/+6
| * | | | | | | Does not halt the GitHub import process when an error occursDouglas Barbosa Alexandre2016-08-242-33/+53
* | | | | | | | Merge branch 'restore-get_id' into 'master' Douwe Maan2016-08-241-3/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Restore get_id in ExtractsPathwinniehell2016-08-241-3/+10
| |/ / / / / /
* | | | | | | Merge branch 'api_only_allow_merge_if_build_succeeds' into 'master' Douwe Maan2016-08-242-3/+7
|\ \ \ \ \ \ \
| * | | | | | | expose 'only_allow_merge_if_build_succeeds' project setting in the APIMarc Dequènes (Duck)2016-08-242-3/+7
| |/ / / / / /
* | | | | | | Merge branch 'entity-api-web-url' into 'master' Douwe Maan2016-08-242-0/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | api: expose web_url for project entitiesBen Boeckel2016-08-241-0/+12
| * | | | | | url_builder: handle project snippetsBen Boeckel2016-08-241-0/+2
| |/ / / / /
* | | | | | api: expose wiki_page_events project hook field in the APIBen Boeckel2016-08-242-1/+3
|/ / / / /
* | | | | entities: make Environment inherit EnvironmentBasicBen Boeckel2016-08-231-4/+3
* | | | | Merge branch 'metrics-typo' into 'master' Yorick Peterse2016-08-221-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix typo in gitlab-workhorse headerJacob Vosmaer2016-08-191-1/+1
* | | | | Merge branch 'disable-issue-by-email' into 'master' Robert Speicher2016-08-201-1/+2
|\ \ \ \ \
| * | | | | Disable “issue by email” feature until it uses a different tokenDouwe Maan2016-08-191-1/+2
* | | | | | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' Stan Hu2016-08-191-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Support integration with Koding (online IDE)Gokmen Goksel2016-08-191-0/+1
* | | | | | Merge branch 'directory-names-containing-space' into 'master' Robert Speicher2016-08-191-9/+3
|\ \ \ \ \ \
| * | | | | | Do not escape URI when extracting path (!5878)winniehell2016-08-191-9/+3
* | | | | | | Merge branch 'wall-clock-time-for-showing-pipeline' into 'master' Robert Speicher2016-08-191-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-201-2/+1
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-1922-15/+864
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Use travel_to instead of dependency injection, feedback:Lin Jen-Shin2016-08-191-5/+0
| * | | | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-1728-185/+570
| |\ \ \ \ \ \
| * | | | | | | Introduce Gitlab::Utils.now so that it's easier to stubLin Jen-Shin2016-08-151-1/+6
* | | | | | | | Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-192-3/+10
|\ \ \ \ \ \ \ \