summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix SAML error 500 when no groups are defined for usertc-saml-fix-false-emptyToon Claes2017-10-182-17/+55
* Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-172-18/+40
|\
| * Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-172-18/+40
* | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-175-7/+121
|\ \
| * | Always use the same order specs for `MultiCollectionPaginator`Bob Van Landuyt2017-10-111-1/+1
| * | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1054-188/+2162
| |\ \
| * | | Optimize queries and pagination in `GroupDescendantsFinder`Bob Van Landuyt2017-10-051-0/+46
| * | | Move merging of Hashes out of the `GroupDescendant` concernBob Van Landuyt2017-10-041-0/+33
| * | | Make it possible to limit ancestors in a `GroupHierarchy`Bob Van Landuyt2017-10-041-0/+28
| * | | Don't break when building unions on empty collectionsBob Van Landuyt2017-10-041-0/+7
| * | | Update `children` route to handle projects and groupsBob Van Landuyt2017-10-041-7/+7
* | | | Merge branch 'git-env-handle-arrays' into 'master'Sean McGivern2017-10-161-5/+37
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add Gitlab::Git::Env.to_env_hashJacob Vosmaer2017-10-161-5/+37
* | | | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-164-53/+55
|\ \ \ \
| * | | | Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-121-10/+10
| * | | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-123-27/+27
| * | | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-123-43/+45
| * | | | Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-121-10/+10
* | | | | Merge branch 'fix_diff_parsing' into 'master'Sean McGivern2017-10-161-0/+17
|\ \ \ \ \
| * | | | | Fix diff parser so it tolerates to diff special markers in the contentValery Sizov2017-10-151-0/+17
| | |/ / / | |/| | |
* | | | | Popen with a timeoutAndrew Newdigate2017-10-161-0/+132
* | | | | Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cl...Kamil Trzciński2017-10-161-0/+2
|\ \ \ \ \
| * | | | | Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, inste...fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-countShinya Maeda2017-10-111-0/+2
* | | | | | Merge branch 'gitlab-ee-1312-time-spent-at' into 'master'Sean McGivern2017-10-132-0/+82
|\ \ \ \ \ \
| * | | | | | added date parameter for time trackinggitlab-ee-1312-time-spent-atVlad2017-10-132-0/+82
| | |_|/ / / | |/| | | |
* | | | | | Merge Merge Requests via GitalyJacob Vosmaer2017-10-131-0/+39
* | | | | | Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'Sean McGivern2017-10-131-0/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-131-0/+12
| | |/ / / | |/| | |
* | | | | Merge branch 'fix/rugged-alternate-paths' into 'master'Douwe Maan2017-10-121-2/+2
|\ \ \ \ \
| * | | | | Fix the format of rugged alternate directory listfix/rugged-alternate-pathsAhmad Sherif2017-10-121-2/+2
* | | | | | Merge branch 'gitaly-fetch-remote' into 'master'Dmitriy Zaporozhets2017-10-121-0/+15
|\ \ \ \ \ \
| * | | | | | Add `Gitlab::Git::Repository#fetch` commandgitaly-fetch-remoteAlejandro Rodríguez2017-10-091-0/+15
* | | | | | | Merge branch 'cache-issuable-template-names' into 'master'Douwe Maan2017-10-121-0/+12
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Cache issuable template namesSean McGivern2017-10-121-0/+8
| * | | | | | Match full file path in FileDetectorSean McGivern2017-10-121-0/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix/pass-git-object-dir-attrs-as-relative' into 'master'Douwe Maan2017-10-112-22/+43
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Pass git object dir attributes as relative paths to GitalyAhmad Sherif2017-10-112-22/+43
* | | | | Merge branch '35580-cannot-import-project-with-milestones' into 'master'Sean McGivern2017-10-113-80/+293
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fixing group label import35580-cannot-import-project-with-milestonesmicael.bergeron2017-10-061-2/+2
| * | | | adding the new spec filemicael.bergeron2017-10-061-0/+188
| * | | | fix the project import when an issue has a group milestonemicael.bergeron2017-10-052-79/+92
| * | | | fix the spec so it fails before applying the fixmicael.bergeron2017-10-042-4/+16
* | | | | Merge branch 'gitaly-has-local-branches' into 'master'Rémy Coutable2017-10-111-0/+11
|\ \ \ \ \
| * | | | | Use Gitaly's RepositoryService.HasLocalBranches RPCgitaly-has-local-branchesAlejandro Rodríguez2017-10-101-0/+11
| | |_|_|/ | |/| | |
* | | | | Simplify project pageAnnabel Dunstone Gray2017-10-111-4/+4
|/ / / /
* | | | Fix a liniting error introduced by !14652Ahmad Sherif2017-10-101-2/+2
* | | | Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into '...Robert Speicher2017-10-101-11/+55
|\ \ \ \ | |_|/ / |/| | |
| * | | Migrate Workhorse Send{Diff,Patch} to Gitalyfeature/migrate-workhorse-send-git-diff-patch-to-gitalyAhmad Sherif2017-10-091-11/+55
* | | | Introduce new hook data builders for Issue and MergeRequest34284-add-changes-to-issuable-webhook-dataRémy Coutable2017-10-093-5/+121
* | | | Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-091-0/+97
View Lorry Controller Status