summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'handle-disabled-request-store' into 'master' Yorick Peterse2016-08-021-40/+61
|\
| * Only use RequestStore in ProjectTeam#max_member_access_for_user if it is activeStan Hu2016-08-011-40/+61
* | Add failing tests for #19028winniehell2016-08-021-0/+12
* | Merge branch 'oldrev-in-update-hooks' into 'master' Douwe Maan2016-08-011-3/+3
|\ \
| * | webhooks: include old revision in MR update eventsBen Boeckel2016-08-011-3/+3
* | | Fix search results for notes without commitsFelipe Artur2016-08-011-0/+20
|/ /
* | Merge branch 'fix-gh-pull-requests' into 'master' Rémy Coutable2016-08-011-3/+15
|\ \
| * | Fix attr reader to force the intended values for source and target shasDouglas Barbosa Alexandre2016-07-311-3/+15
* | | Merge branch 'fix-extra-new-line-crlf' into 'master' Rémy Coutable2016-08-013-2/+15
|\ \ \
| * | | Fix specsfix-extra-new-line-crlfRémy Coutable2016-08-012-2/+2
| * | | Trim extra displayed carriage returns in diffs and files with CRLFsStan Hu2016-08-012-1/+14
* | | | Merge branch '15064_issuable_default_sort_order' into 'master' Rémy Coutable2016-08-015-35/+216
|\ \ \ \ | |/ / / |/| | |
| * | | State specific default sort order for issuableszs2016-08-015-35/+216
* | | | Merge branch 'fix/labels-milestones-import' into 'master' Rémy Coutable2016-08-013-141/+77
|\ \ \ \
| * | | | squashed - fixed label and milestone association problems, updated specs and ...fix/labels-milestones-importJames Lopez2016-08-013-141/+77
| | |_|/ | |/| |
* | | | Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-015-2/+209
|\ \ \ \ | |/ / / |/| | |
| * | | Minor fixes in the Env API endpointszj-env-external-urlZ.J. van de Weg2016-08-011-2/+18
| * | | Use Grape DSL for environment endpointsZ.J. van de Weg2016-07-292-23/+35
| * | | Incorporate feedbackZ.J. van de Weg2016-07-293-16/+31
| * | | Add API support for environmentsZ.J. van de Weg2016-07-291-0/+103
| * | | Add an URL field to EnvironmentsZ.J. van de Weg2016-07-294-2/+63
| |/ /
* | | Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured.lookatmike2016-07-311-0/+6
| |/ |/|
* | Merge branch 'reject-merge-conflicts' into 'master' Robert Speicher2016-07-301-0/+11
|\ \
| * | Properly abort a merge when merge conflicts occurreject-merge-conflictsStan Hu2016-07-291-0/+11
* | | Improve diff performance by eliminating redundant checks for text blobsremove-redundant-blob-text-callsStan Hu2016-07-291-0/+18
|/ /
* | Merge branch 'fix/import-project-hooks' into 'master' Douwe Maan2016-07-291-1/+2
|\ \
| * | fix repo hooks missing on importfix/import-project-hooksJames Lopez2016-07-281-1/+2
* | | Merge branch 'ability-batch-issue-checking' into 'master' Robert Speicher2016-07-294-7/+312
|\ \ \
| * | | Method for returning issues readable by a userability-batch-issue-checkingYorick Peterse2016-07-294-7/+312
* | | | Merge branch 'refactor/ci-config-move-job-entries' into 'master' Rémy Coutable2016-07-2913-83/+623
|\ \ \ \
| * | | | Improve code, remove unused validator, improve namesGrzegorz Bizon2016-07-292-3/+3
| * | | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-2244-1103/+1449
| |\ \ \ \
| * | | | | Move job dependencies entry to the new CI configGrzegorz Bizon2016-07-201-1/+1
| * | | | | Add minor readability, style improvements in CI configGrzegorz Bizon2016-07-201-1/+1
| * | | | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-2052-1086/+2299
| |\ \ \ \ \
| * | | | | | Move job environment validation to new CI configGrzegorz Bizon2016-07-191-3/+3
| * | | | | | Move tags and allow_failure CI entries to new configGrzegorz Bizon2016-07-181-2/+2
| * | | | | | Validate allowed keys only in new CI configGrzegorz Bizon2016-07-181-0/+10
| * | | | | | Improve valid keys validation for CI config nodesGrzegorz Bizon2016-07-181-5/+16
| * | | | | | Move job artifacts configuration new CI config codeGrzegorz Bizon2016-07-183-6/+83
| * | | | | | Move job variables config entry to new CI configGrzegorz Bizon2016-07-181-1/+1
| * | | | | | Move except and only job nodes to new CI configGrzegorz Bizon2016-07-182-2/+58
| * | | | | | Move job image and services nodes to new CI configGrzegorz Bizon2016-07-181-4/+4
| * | | | | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-18147-875/+6380
| |\ \ \ \ \ \
| * | | | | | | Simplify abstract class for CI config entry nodesGrzegorz Bizon2016-07-151-4/+10
| * | | | | | | Simplify CI config and remove logical validationGrzegorz Bizon2016-07-152-8/+2
| * | | | | | | Add metadata to new CI config and expose job nameGrzegorz Bizon2016-07-154-37/+34
| * | | | | | | Remove job cache configfrom legacy yaml processorGrzegorz Bizon2016-07-141-3/+3
| * | | | | | | Remove references to global entry in new CI configGrzegorz Bizon2016-07-143-13/+4
| * | | | | | | Revert logical validation in CI job stage entryGrzegorz Bizon2016-07-142-67/+8