summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-127-29/+11
| | | | Having a distinct class just for that was a bit overkill
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-1213-280/+291
| | | | Rename classes to (hopefully) clearer names while we're doing that.
* Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-128-227/+314
| | | | | This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
* 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-125-6/+6
|
* Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-121-13/+49
|
* Merge branch 'fix/rugged-alternate-paths' into 'master'Douwe Maan2017-10-121-0/+1
|\ | | | | | | | | | | | | 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-0/+1
| | | | | | | | Fixes #39046
* | Merge branch 'gitaly-fetch-remote' into 'master'Dmitriy Zaporozhets2017-10-121-0/+6
|\ \ | | | | | | | | | | | | | | | | | | 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/+6
| | |
* | | Merge branch 'cache-issuable-template-names' into 'master'Douwe Maan2017-10-121-14/+14
|\ \ \ | | | | | | | | | | | | | | | | Cache issuable template names See merge request gitlab-org/gitlab-ce!14823
| * | | Cache issuable template namesSean McGivern2017-10-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '39028-repo-by-url-fields' into 'master'Tim Zallmann2017-10-121-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project fields to import project by url Closes #39028 See merge request gitlab-org/gitlab-ce!14822
| * | | | 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 Gitaly Closes gitaly#629 See merge request gitlab-org/gitlab-ce!14713
| * | Pass git object dir attributes as relative paths to GitalyAhmad Sherif2017-10-113-5/+25
| | | | | | | | | | | | Fixes gitaly#629
* | | Merge branch '35580-cannot-import-project-with-milestones' into 'master'Sean McGivern2017-10-112-18/+35
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 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-17/+27
| | |
| * | fix the project import when an issue has a group milestonemicael.bergeron2017-10-051-2/+9
| | |
| * | fix the import :milestone from adding the group_idmicael.bergeron2017-10-031-1/+1
| | |
* | | Merge branch 'gitaly-has-local-branches' into 'master'Rémy Coutable2017-10-113-9/+8
|\ \ \ | | | | | | | | | | | | | | | | 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-103-9/+8
| | | |
* | | | Merge branch ↵Kamil Trzciński2017-10-111-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/move-callback-route-google_api-auth-callback-for-oauth-under' into 'master' Move callback route(`google_api/auth/callback`) for Oauth under `-` Closes #38911 See merge request gitlab-org/gitlab-ce!14802
| * | | | Remove unnecessary TOLLEVEL routes from path_regex.rbfix/sm/move-callback-route-google_api-auth-callback-for-oauth-underShinya Maeda2017-10-111-1/+0
| |/ / /
* | | | Simplify project pageAnnabel Dunstone Gray2017-10-111-6/+6
|/ / /
* | | Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into ↵Robert Speicher2017-10-101-10/+36
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | '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-10/+36
| | |
* | | Introduce new hook data builders for Issue and MergeRequest34284-add-changes-to-issuable-webhook-dataRémy Coutable2017-10-093-2/+139
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-091-0/+36
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Don't create fork networks for root projects that are deletedbvl-fork-network-migrationsBob Van Landuyt2017-10-092-0/+10
|/ /
* | Merge branch '38890-fix-gpg-signature-updater-when-commit-is-missing' into ↵Stan Hu2017-10-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error with GPG signature updater when commit was deleted Closes #38890 See merge request gitlab-org/gitlab-ce!14749
| * | Fix error with GPG signature updater when commit was deleted38890-fix-gpg-signature-updater-when-commit-is-missingRubén Dávila2017-10-071-1/+1
| | |
* | | Sync up hard coded DN class in migrationmk-normalize-ldap-user-dnsMichael Kozono2017-10-071-20/+28
| | |
* | | Redefine `respond_to?` in light of `method_missing`Michael Kozono2017-10-071-0/+6
| | |
* | | Make internal methods privateMichael Kozono2017-10-071-20/+22
| | |
* | | Leave bad DNs alone instead of raising errorsMichael Kozono2017-10-072-3/+10
| | |
* | | Refactor DN error classesMichael Kozono2017-10-073-28/+30
| | |
* | | Move migration to backgroundMichael Kozono2017-10-071-0/+304
| | |
* | | Normalize values, reusing DN normalization codeMichael Kozono2017-10-072-33/+8
| | | | | | | | | | | | I first attempted to extract logic from the code that normalizes DNs, but I was unsuccessful. This is a hack but it works.
* | | Fix space strippingMichael Kozono2017-10-071-20/+24
| | | | | | | | | | | | Especially from the last attribute value.
* | | Rename method to `to_normalized_s`Michael Kozono2017-10-073-3/+3
| | |
* | | Refactor initialize method for clarityMichael Kozono2017-10-071-11/+20
| | |
* | | Move downcasing to normalize methodMichael Kozono2017-10-071-10/+10
| | |
* | | Resolve Rubocop offensesMichael Kozono2017-10-071-17/+25
| | | | | | | | | | | | Disabling some for now since this is based on `Net::LDAP::DN`.
* | | Switch to new DN classMichael Kozono2017-10-072-17/+2
| | | | | | | | | | | | for normalizing and parsing DNs
* | | Fix trailing escaped newlineMichael Kozono2017-10-071-2/+2
| | |
* | | Test malformed DNsMichael Kozono2017-10-071-9/+12
| | |
* | | Raise UnsupportedDnFormatError on multivalued RDNsMichael Kozono2017-10-071-0/+2
| | |
* | | Fix for null DNMichael Kozono2017-10-071-1/+1
| | |
View Lorry Controller Status