summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-172-6/+16
|\
| * Don't use `Redis#keys` in the circuitbreakerbvl-do-not-use-redis-keysBob Van Landuyt2017-10-172-6/+16
* | Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclassSean McGivern2017-10-171-0/+1
* | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-173-18/+36
|\ \
| * | Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-173-18/+36
* | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-175-6/+209
|\ \ \
| * \ \ Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1081-375/+2113
| |\ \ \
| * | | | Reuse `base_and_ancestors` for `ancestors` in `GroupHierarchy`Bob Van Landuyt2017-10-101-2/+1
| * | | | Optimize queries and pagination in `GroupDescendantsFinder`Bob Van Landuyt2017-10-051-0/+61
| * | | | Move merging of Hashes out of the `GroupDescendant` concernBob Van Landuyt2017-10-041-0/+117
| * | | | Make it possible to limit ancestors in a `GroupHierarchy`Bob Van Landuyt2017-10-041-4/+27
| * | | | Don't break when building unions on empty collectionsBob Van Landuyt2017-10-041-1/+5
| * | | | Update `children` route to handle projects and groupsBob Van Landuyt2017-10-041-1/+0
* | | | | Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan2017-10-161-1/+0
|\ \ \ \ \
| * | | | | Remove boards from the list of reserved top pathsValery Sizov2017-10-131-1/+0
* | | | | | Merge branch 'sha-handling' into 'master'Douwe Maan2017-10-166-22/+21
|\ \ \ \ \ \
| * | | | | | Adds requirements that supports anything in sha paramsGuilherme Vieira2017-10-126-22/+21
* | | | | | | Merge branch 'git-env-handle-arrays' into 'master'Sean McGivern2017-10-162-1/+12
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add Gitlab::Git::Env.to_env_hashJacob Vosmaer2017-10-162-1/+12
* | | | | | | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-1616-213/+333
|\ \ \ \ \ \ \
| * | | | | | | Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-1210-32/+14
| * | | | | | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-1216-283/+294
| * | | | | | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-128-227/+314
| * | | | | | | Clean hierarchy of calls between models and Gitalb::Git for blob searchAlejandro Rodríguez2017-10-121-0/+4
| * | | | | | | Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-128-9/+9
| * | | | | | | Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-121-13/+49
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix_diff_parsing' into 'master'Sean McGivern2017-10-161-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix diff parser so it tolerates to diff special markers in the contentValery Sizov2017-10-151-1/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Fix confusing double usage of 'metadata'Jacob Vosmaer (GitLab)2017-10-161-4/+16
* | | | | | | Popen with a timeoutAndrew Newdigate2017-10-162-0/+70
* | | | | | | 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-131-0/+54
|\ \ \ \ \ \ \
| * | | | | | | added date parameter for time trackinggitlab-ee-1312-time-spent-atVlad2017-10-131-0/+54
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge Merge Requests via GitalyJacob Vosmaer2017-10-134-3/+80
* | | | | | | Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'Sean McGivern2017-10-131-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-131-0/+7
* | | | | | | Merge branch 'fix/rugged-alternate-paths' into 'master'Douwe Maan2017-10-121-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix the format of rugged alternate directory listfix/rugged-alternate-pathsAhmad Sherif2017-10-121-0/+1
* | | | | | | | Merge branch 'gitaly-fetch-remote' into 'master'Dmitriy Zaporozhets2017-10-121-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add `Gitlab::Git::Repository#fetch` commandgitaly-fetch-remoteAlejandro Rodríguez2017-10-091-0/+6
* | | | | | | | | Merge branch 'cache-issuable-template-names' into 'master'Douwe Maan2017-10-121-14/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Cache issuable template namesSean McGivern2017-10-121-0/+2
| * | | | | | | | Match full file path in FileDetectorSean McGivern2017-10-121-14/+12
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Move all API authentication code to APIGuardDouwe Maan2017-10-122-92/+93
* | | | | | | | Merge branch '39028-repo-by-url-fields' into 'master'Tim Zallmann2017-10-121-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Update template description wording39028-repo-by-url-fieldsAnnabel Dunstone Gray2017-10-111-3/+3
| |/ / / / / /
* | | | | | | Merge branch 'fix/pass-git-object-dir-attrs-as-relative' into 'master'Douwe Maan2017-10-113-5/+25
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Pass git object dir attributes as relative paths to GitalyAhmad Sherif2017-10-113-5/+25
* | | | | | Merge branch '35580-cannot-import-project-with-milestones' into 'master'Sean McGivern2017-10-112-18/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
View Lorry Controller Status