summaryrefslogtreecommitdiff
path: root/lib
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>
* Use ApplicationSetting.current_without_cache instead of ↵Rémy Coutable2018-05-233-3/+3
| | | | | | ApplicationSetting.current where applicable Signed-off-by: Rémy Coutable <remy@rymai.me>
* Introduce a new CacheableAttributes concernRémy Coutable2018-05-231-0/+4
| | | | 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
| | |
* | | Increase text limit for GPG keys (mysql only).ab-46530-mediumtext-for-gpg-keysAndreas Brandl2018-05-221-0/+2
| |/ |/| | | | | Closes #46530.
* | Merge branch 'ab-42194-keyset-pagination' into 'master'Yorick Peterse2018-05-222-42/+213
|\ \ | | | | | | | | | | | | | | | | | | API: Keyset pagination support Closes #45756 See merge request gitlab-org/gitlab-ce!18584
| * | Add feature-flag for keyset pagination.ab-42194-keyset-paginationAndreas Brandl2018-05-211-1/+1
| | |
| * | Add keyset pagination for API calls.Andreas Brandl2018-05-211-5/+165
| | | | | | | | | | | | Closes #45756.
| * | Refactor and extract DefaultPaginationStrategy.Andreas Brandl2018-05-212-45/+56
| | |
* | | Merge branch 'ab-43706-composite-primary-keys' into 'master'Yorick Peterse2018-05-221-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migration to add primary key constraint for composite keys Closes #43706 and #32258 See merge request gitlab-org/gitlab-ce!18980
| * | | Migration to add/drop primary key constraints for composite keys.ab-43706-composite-primary-keysAndreas Brandl2018-05-211-0/+15
| |/ / | | | | | | | | | Closes #43706.
* | | Expose readme url in Project APIImre Farkas2018-05-221-1/+1
| | |
* | | Fix `expose_url` helper does not include custom base url if it is setFrancisco Javier López2018-05-221-2/+7
|/ /
* | Merge branch 'create-live-trace-only-if-job-is-complete' into 'master'Kamil Trzciński2018-05-211-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Append trace chunk only if job is running Closes #46383 See merge request gitlab-org/gitlab-ce!18969
| * | Add the same gurad clause with artifacts uplaodingShinya Maeda2018-05-211-1/+2
| | |
| * | Append trace only if the job is runningShinya Maeda2018-05-211-1/+1
| | |
* | | Merge branch '45528-repeated-calls-to-redis-for-flipper-feature-flag' into ↵Stan Hu2018-05-211-1/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Repeated calls to Redis for Flipper feature flag" Closes #45528 See merge request gitlab-org/gitlab-ce!18490
| * | | Ensure Flipper memoizer is used in Sidekiq's context45528-repeated-calls-to-redis-for-flipper-feature-flagRémy Coutable2018-05-181-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, don't use the provided Middleware, which isn't thread-safe, and instantiate a new Flipper instance per thread instead. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '44799-api-naming-issue-scope' into 'master'Rémy Coutable2018-05-212-8/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API naming for issue scope" Closes #44799 See merge request gitlab-org/gitlab-ce!18935
| * | | | Add created_by_me and assigned_to_me scopes44799-api-naming-issue-scopeMark Chao2018-05-212-8/+10
| | | | | | | | | | | | | | | | | | | | Deprecate corresponding dash versions created-by-me and assigned-to-me
* | | | | 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
| | | | | | |
* | | | | | | Fix double brackets being linkified in wiki markdownAlex2018-05-181-0/+3
| | | | | | |
* | | | | | | 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
View Lorry Controller Status