summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'git-env-handle-arrays' into 'master'Sean McGivern2017-10-161-5/+37
|\ | | | | | | | | Add Gitlab::Git::Env.to_env_hash See merge request gitlab-org/gitlab-ce!14841
| * 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
|\ \ | | | | | | | | | | | | Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747
| * | Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-121-10/+10
| | | | | | | | | | | | Having a distinct class just for that was a bit overkill
| * | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-123-27/+27
| | | | | | | | | | | | Rename classes to (hopefully) clearer names while we're doing that.
| * | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-123-43/+45
| | | | | | | | | | | | | | | This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
| * | 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 content Closes #34431 See merge request gitlab-org/gitlab-ce!14848
| * | | 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 ↵Kamil Trzciński2017-10-161-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master' Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count` Closes #38960 See merge request gitlab-org/gitlab-ce!14807
| * | | Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, ↵fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-countShinya Maeda2017-10-111-0/+2
| | | | | | | | | | | | | | | | instead of `Gcp::Cluster.count`
* | | | Merge branch 'gitlab-ee-1312-time-spent-at' into 'master'Sean McGivern2017-10-132-0/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | added date parameter for time tracking See merge request gitlab-org/gitlab-ce!14866
| * | | | 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
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Make "merge ongoing" check more consistent Closes #39032 See merge request gitlab-org/gitlab-ce!14825
| * | | 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 list Closes #39046 See merge request gitlab-org/gitlab-ce!14840
| * | | Fix the format of rugged alternate directory listfix/rugged-alternate-pathsAhmad Sherif2017-10-121-2/+2
| | | | | | | | | | | | | | | | Fixes #39046
* | | | Merge branch 'gitaly-fetch-remote' into 'master'Dmitriy Zaporozhets2017-10-121-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `Gitlab::Git::Repository#fetch` command Closes gitaly#586 See merge request gitlab-org/gitlab-ce!14772
| * | | | 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 names See merge request gitlab-org/gitlab-ce!14823
| * | | | Cache issuable template namesSean McGivern2017-10-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were looking these up on each request to an issue page, because the form is pre-filled, as is the template dropdown. That was unnecessary: we could just treat these as 'special' repository files (like the rendered README) and cache them in Redis until they change on a push.
| * | | | Match full file path in FileDetectorSean McGivern2017-10-121-0/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The basename appears to have been a holdover from the past - it doesn't look necessary now. Some of the regexes were unanchored on one side, so explicitly ensure that they only match the root. Apart from that, this means that pushing to foo/README.md will no longer invalidate the main README cache for a project.
* | | | 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 Gitaly Closes gitaly#629 See merge request gitlab-org/gitlab-ce!14713
| * | Pass git object dir attributes as relative paths to GitalyAhmad Sherif2017-10-112-22/+43
| | | | | | | | | | | | Fixes gitaly#629
* | | Merge branch '35580-cannot-import-project-with-milestones' into 'master'Sean McGivern2017-10-113-80/+293
|\ \ \ | |/ / |/| | | | | | | | | | | | | | fix the import :milestone from adding the group_id Closes #35580 See merge request gitlab-org/gitlab-ce!14657
| * | 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 RPC See merge request gitlab-org/gitlab-ce!14753
| * | | 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
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 'master' Migrate Workhorse Send{Diff,Patch} to Gitaly See merge request gitlab-org/gitlab-ce!14652
| * | 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
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-091-0/+97
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'bvl-fork-network-migrations' into 'master'Yorick Peterse2017-10-091-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Create fork networks for root projects that are deleted Closes #38905 See merge request gitlab-org/gitlab-ce!14752
| * | | Don't create fork networks for root projects that are deletedbvl-fork-network-migrationsBob Van Landuyt2017-10-091-0/+8
| |/ /
* | | Merge branch '37552-replace-js-true-with-js' into 'master'Rémy Coutable2017-10-0915-34/+34
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Replaces `tag: true` into `:tag` in the specs Closes #37552 See merge request gitlab-org/gitlab-ce!14653
| * | Replaces `tag: true` into `:tag` in the specsJacopo2017-10-0715-34/+34
| | | | | | | | | | | | | | | | | | Replaces all the explicit include metadata syntax in the specs (tag: true) into the implicit one (:tag). Added a cop to prevent future errors and handle autocorrection.
* | | Leave bad DNs alone instead of raising errorsMichael Kozono2017-10-072-35/+15
| | |
* | | Refactor DN error classesMichael Kozono2017-10-071-48/+48
| | |
* | | Add migration specsMichael Kozono2017-10-071-0/+36
| | |
* | | Normalize values, reusing DN normalization codeMichael Kozono2017-10-072-28/+74
| | | | | | | | | | | | I first attempted to extract logic from the code that normalizes DNs, but I was unsuccessful. This is a hack but it works.
* | | Remove telephoneNumber format commentMichael Kozono2017-10-071-6/+0
| | | | | | | | | | | | Since that behavior changed, and is now under the malformed DN context.
* | | Fix space strippingMichael Kozono2017-10-071-1/+7
| | | | | | | | | | | | Especially from the last attribute value.
* | | Rename method to `to_normalized_s`Michael Kozono2017-10-071-2/+2
| | |
View Lorry Controller Status