summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-2810-39/+36
|\
| * Replace Gitlab::REVISION with Gitlab.revision and handle installations withou...46600-fix-gitlab-revision-when-not-in-git-repoRémy Coutable2018-05-241-1/+1
| * Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributesRémy Coutable2018-05-231-26/+18
| * Merge branch 'issue-25256' into 'master'Douwe Maan2018-05-233-5/+12
| |\
| | * skip email trim when email is creating new issueCameron Crockett2018-05-223-5/+12
| * | Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
| |\ \
| | * | 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 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 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 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 filesdm-xcode-project-directoryDouwe Maan2018-05-221-1/+1
| * | Refactor and extract DefaultPaginationStrategy.Andreas Brandl2018-05-211-2/+0
* | | Remvoe disable_ddl_transaction! and redandant RecordNotUnique exception rescueShinya Maeda2018-05-221-1/+1
* | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-2226-145/+436
|\ \ \ | |/ /
| * | Merge branch 'zj-workhorse-archive-mandatory' into 'master'Grzegorz Bizon2018-05-212-8/+3
| |\ \
| | * | 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
| |\ \ \
| | * | | Fix error when deleting an empty list of refsxeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refsSergey Sinev2018-05-181-1/+1
| * | | | Merge branch '46498-do-not-modify-strings' into 'master'Stan Hu2018-05-192-11/+11
| |\ \ \ \
| | * | | | 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 messagesAhmad Sherif2018-05-188-28/+187
| | |/ / /
| * | | | Merge branch 'gitaly-1182-search-by-content-name' into 'master'Robert Speicher2018-05-182-5/+31
| |\ \ \ \
| | * | | | 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
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Minimize CE/EE difference in Gitlab::Auth::LDAP::ConfigRémy Coutable2018-05-181-2/+16
| | * | | Minimize CE/EE difference in Gitlab::Auth::LDAP::AccessRémy Coutable2018-05-181-10/+31
| | * | | Minimize CE/EE difference in Gitlab::Auth::UserAuthFindersRémy Coutable2018-05-181-4/+6
| | * | | Minimize CE/EE difference in Gitlab::Auth::Saml::UserRémy Coutable2018-05-181-4/+2
| | * | | Minimize CE/EE difference in Gitlab::Auth::Saml::ConfigRémy Coutable2018-05-181-0/+4
| * | | | Merge branch 'zj-calculate-checksum-mandator' into 'master'Nick Thomas2018-05-181-38/+6
| |\ \ \ \
| | * | | | Calculating repository checksums executed by GitalyZeger-Jan van de Weg2018-05-181-38/+6
| * | | | | Merge branch 'memoize-database-version' into 'master'Rémy Coutable2018-05-181-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Memoize Gitlab::Database.versionmemoize-database-versionYorick Peterse2018-05-171-1/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'feature/gb/add-regexp-variables-expression' into 'master'Kamil Trzciński2018-05-186-7/+108
| |\ \ \ \
| | * | | | 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
| | |\ \ \ \
| | * | | | | Add pattern matching variables expression lexemeGrzegorz Bizon2018-05-141-0/+29
View Lorry Controller Status