summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributesRémy Coutable2018-05-231-26/+18
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'issue-25256' into 'master'Douwe Maan2018-05-233-5/+12
|\ | | | | | | | | skip email trim when email is creating new issue See merge request gitlab-org/gitlab-ce!18865
| * skip email trim when email is creating new issueCameron Crockett2018-05-223-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates from MR discussion 1. Added test for ReplyParser 2. Changed param to trim_reply with default set as true Removed keyword param in favor of normal options param updates for MR discussion Resolutions for code review comments more code review fixes
* | Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ | | | | | | | | | | | | Make Repo#squash_in_progress Opt-Out See merge request gitlab-org/gitlab-ce!19088
| * | Make Repo#squash_in_progress Opt-Outgitaly-repo-squash-in-progress-opt-outKim Carlbäcker2018-05-221-1/+1
| | |
* | | Merge branch 'gitaly-wiki-get-formatted-data-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Move Wiki::GetFormattedData to OptOut See merge request gitlab-org/gitlab-ce!19091
| * | | Move Wiki::GetFormattedData to OptOutgitaly-wiki-get-formatted-data-opt-outKim Carlbäcker2018-05-221-1/+1
| |/ /
* | | Merge branch 'gitaly-import-project-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Move ImportProject to OptOut in Gitaly See merge request gitlab-org/gitlab-ce!19090
| * | | Move ImportProject to OptOut in Gitalygitaly-import-project-opt-outKim Carlbäcker2018-05-221-1/+1
| |/ /
* | | Merge branch 'gitaly-repo-info-attributes-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ | |_|/ |/| | | | | | | | Move Repository#info_attributes to OptOut in gitaly See merge request gitlab-org/gitlab-ce!19092
| * | Move Repository#info_attributes to OptOut in gitalygitaly-repo-info-attributes-opt-outKim Carlbäcker2018-05-221-1/+1
| |/
* | Merge branch 'dm-xcode-project-directory' into 'master'Robert Speicher2018-05-221-1/+1
|\ \ | |/ |/| | | | | Fix Xcode project detection by looking for dirs instead of files See merge request gitlab-org/gitlab-ce!19035
| * Fix Xcode project detection by looking for dirs instead of filesdm-xcode-project-directoryDouwe Maan2018-05-221-1/+1
| |
* | Refactor and extract DefaultPaginationStrategy.Andreas Brandl2018-05-211-2/+0
| |
* | Merge branch 'zj-workhorse-archive-mandatory' into 'master'Grzegorz Bizon2018-05-212-8/+3
|\ \ | | | | | | | | | | | | Move git archives downloading to Gitaly See merge request gitlab-org/gitlab-ce!18990
| * | Move git archives downloading to GitalyZeger-Jan van de Weg2018-05-172-8/+3
| | |
* | | Merge branch 'xeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs' into ↵Grzegorz Bizon2018-05-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error when deleting an empty list of refs Closes #45743 See merge request gitlab-org/gitlab-ce!19053
| * | | Fix error when deleting an empty list of refsxeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refsSergey Sinev2018-05-181-1/+1
| | | | | | | | | | | | | | | | Closes #45743
* | | | Merge branch '46498-do-not-modify-strings' into 'master'Stan Hu2018-05-192-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Blob#batch can't handle frozen string paths" Closes #46498 See merge request gitlab-org/gitlab-ce!19039
| * | | | Fix a RuntimeError: cannot modify frozen stringNick Thomas2018-05-182-11/+11
| | |_|/ | |/| |
* | | | Merge branch 'fix/handle-large-commit-tag-message' into 'master'Robert Speicher2018-05-188-28/+187
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add handling for commit/tags with big messages See merge request gitlab-org/gitlab-ce!17892
| * | | | Add handling for commit/tags with big messagesAhmad Sherif2018-05-188-28/+187
| |/ / /
* | | | Merge branch 'gitaly-1182-search-by-content-name' into 'master'Robert Speicher2018-05-182-5/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Migrate Repo#search_by_{content,name} to Gitaly See merge request gitlab-org/gitlab-ce!18750
| * | | | Migrate RepositoryService#SearchFilesBy{Content,Name}gitaly-1182-search-by-content-nameKim "BKC" Carlbäcker2018-05-182-5/+31
| |/ / /
* | | | Merge branch '5913-extract-ee-specific-lines-for-lib-gitlab-auth' into 'master'Robert Speicher2018-05-185-20/+59
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | [CE] Resolve "Extract EE specific files/lines for lib/gitlab/auth" See merge request gitlab-org/gitlab-ce!19037
| * | | Minimize CE/EE difference in Gitlab::Auth::LDAP::ConfigRémy Coutable2018-05-181-2/+16
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Minimize CE/EE difference in Gitlab::Auth::LDAP::AccessRémy Coutable2018-05-181-10/+31
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Minimize CE/EE difference in Gitlab::Auth::UserAuthFindersRémy Coutable2018-05-181-4/+6
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Minimize CE/EE difference in Gitlab::Auth::Saml::UserRémy Coutable2018-05-181-4/+2
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Minimize CE/EE difference in Gitlab::Auth::Saml::ConfigRémy Coutable2018-05-181-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'zj-calculate-checksum-mandator' into 'master'Nick Thomas2018-05-181-38/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculating repository checksums executed by Gitaly Closes gitaly#1105 and #46293 See merge request gitlab-org/gitlab-ce!18907
| * | | | Calculating repository checksums executed by GitalyZeger-Jan van de Weg2018-05-181-38/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OPT_OUT status has been removed, and alternative implementation removed. Also checks if the repository exists before executing the checksum RPC to guard against NotFound errors. Closes gitlab-org/gitaly#1105
* | | | | Merge branch 'memoize-database-version' into 'master'Rémy Coutable2018-05-181-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Memoize Gitlab::Database.version See merge request gitlab-org/gitlab-ce!19021
| * | | | Memoize Gitlab::Database.versionmemoize-database-versionYorick Peterse2018-05-171-1/+1
| | |/ / | |/| | | | | | | | | | | | | | This removes the need for running a database query every time we want to check the database version.
* | | | Merge branch 'feature/gb/add-regexp-variables-expression' into 'master'Kamil Trzciński2018-05-186-7/+108
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for variables expression regexp syntax Closes #43601 See merge request gitlab-org/gitlab-ce!18902
| * | | | Simplify pattern lexeme fabrication and matcherfeature/gb/add-regexp-variables-expressionGrzegorz Bizon2018-05-181-2/+2
| | | | |
| * | | | Simplify untrusted regexp factory methodGrzegorz Bizon2018-05-181-9/+6
| | | | |
| * | | | Add variables expression pattern validation supportGrzegorz Bizon2018-05-171-0/+4
| | | | |
| * | | | Add anti-corruption layer above expressions pattern matchingGrzegorz Bizon2018-05-171-2/+2
| | | | |
| * | | | Add extended /regexp/ scheme support to untrusted regexpGrzegorz Bizon2018-05-171-0/+23
| | | | |
| * | | | Remove useless assignment in pattern lexemeGrzegorz Bizon2018-05-151-1/+1
| | | | |
| * | | | Do not support inverse variable pattern matchingGrzegorz Bizon2018-05-151-2/+1
| | | | |
| * | | | Add support for pattern matching in variables expressionsGrzegorz Bizon2018-05-154-3/+9
| | | | |
| * | | | Reorganize exceptions in pipeline expressions moduleGrzegorz Bizon2018-05-155-9/+16
| | | | |
| * | | | Merge branch 'master' into feature/gb/add-regexp-variables-expressionGrzegorz Bizon2018-05-159-31/+78
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Conflicts: lib/gitlab/untrusted_regexp.rb
| * | | | | Add pattern matching variables expression lexemeGrzegorz Bizon2018-05-141-0/+29
| | | | | |
| * | | | | Raise variables statement exception if pattern is invalidGrzegorz Bizon2018-05-142-2/+6
| | | | | |
| * | | | | Do not raise if variable expression can not be evaluatedGrzegorz Bizon2018-05-141-0/+2
| | | | | |
| * | | | | Implement variables expression untrusted pattern lexemeGrzegorz Bizon2018-05-111-0/+26
| | | | | |
| * | | | | Make it possible to compare untrusted regexpsGrzegorz Bizon2018-05-111-1/+5
| | | | | |
View Lorry Controller Status