summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* remove Ability.abilitieshttp://jneen.net/2016-08-302-6/+2
* remove six, and use a Set insteadhttp://jneen.net/2016-08-301-5/+1
* Merge branch 'artifacts-from-ref-and-build-name' into 'master' Douwe Maan2016-08-302-4/+2
|\
| * Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-2623-175/+267
| |\
| * | Fix testsLin Jen-Shin2016-08-261-3/+1
| * | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-249-27/+34
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1911-6/+474
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1811-9/+390
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1730-186/+643
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1630-899/+474
| |\ \ \ \ \ \
| * | | | | | | Reverse ref and sha in args and rename pipeline to pipeline_forLin Jen-Shin2016-08-111-1/+1
* | | | | | | | Merge branch 'fix/ci-config-hidden-key-validation' into 'master' Douwe Maan2016-08-302-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename CI config hidden job entry to hidden entryGrzegorz Bizon2016-08-292-2/+2
| * | | | | | | | Do not enforce using a hash with hidden ci keyGrzegorz Bizon2016-08-291-1/+0
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | lib/backup: fix broken permissions when creating repo dirDirk Hörner2016-08-301-1/+1
|/ / / / / / /
* | | | | | | 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
View Lorry Controller Status