summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* improve log output of jasmine `toEqual` with nested objects/arrays49128-improve-log-output-of-jasmine-toequalLukas Eipert2018-07-113-2/+18
|
* Merge branch 'milestone-tests' into 'master'Rémy Coutable2018-07-1116-18/+151
|\ | | | | | | | | | | | | Milestone tests Closes gitlab-qa#231 See merge request gitlab-org/gitlab-ce!20111
| * Milestone testsDan Davison2018-07-1116-18/+151
|/
* Fix long changelog file nameSean McGivern2018-07-111-0/+0
|
* Merge branch '42751-rename-master-to-maintainer-2' into 'master'Dmitriy Zaporozhets2018-07-11495-1596/+1631
|\ | | | | | | | | | | | | Resolve "Rename the `Master` role to `Maintainer`" Backend Closes #42751 See merge request gitlab-org/gitlab-ce!19413
| * Resolve "Rename the `Master` role to `Maintainer`" BackendMark Chao2018-07-11495-1596/+1631
|/
* Merge branch '49114-add-gitaly-servers-to-admin-overview-navigation-menu' ↵Douwe Maan2018-07-112-2/+11
|\ | | | | | | | | | | | | | | | | into 'master' Resolve "Add Gitaly Servers to Admin > Overview navigation menu" Closes #49114 See merge request gitlab-org/gitlab-ce!20550
| * Add Gitaly Servers to Admin > Overview menu49114-add-gitaly-servers-to-admin-overview-navigation-menuGabriel Mazetto2018-07-112-2/+11
| |
* | Merge branch ↵Douwe Maan2018-07-113-8/+42
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '45592-nomethoderror-undefined-method-commit-for-nil-nilclass-in-sidekiq-caused-by-a-merge-commit-in-a-forked-project-with-upstream-project-deleted' into 'master' Resolve "NoMethodError: undefined method `commit' for nil:NilClass in sidekiq caused by a merge commit in a forked project with upstream project deleted." Closes #45592 See merge request gitlab-org/gitlab-ce!20534
| * | Fix ProcessCommitWorker when upstream project is deletedSean McGivern2018-07-103-8/+42
| | |
* | | Merge branch 'sh-bump-gitlab-shell' into 'master'Douwe Maan2018-07-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Bump gitlab-shell to 7.1.5 See merge request gitlab-org/gitlab-ce!20545
| * | | Bump gitlab-shell to 7.1.5Stan Hu2018-07-101-1/+1
| | | | | | | | | | | | | | | | Fixes a NoMethodError in the pre-receive hook: https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/206
* | | | Merge branch 'make-sure-env-name-not-ending-in-slash' into 'master'Nick Thomas2018-07-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid building potential invalid environment name while seeding See merge request gitlab-org/gitlab-ce!20523
| * | | | Make sure we're matching the same way.Lin Jen-Shin2018-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby's regular expression is unicode aware, therefore 'å' also matches against /\p{alnum}/. If we want only ASCII-7bit, use [a-zA-Z0-9]+ so they always match the same thing
* | | | | Merge branch 'gitaly-0.112.0' into 'master'Sean McGivern2018-07-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use gitaly 0.112.0 See merge request gitlab-org/gitlab-ce!20548
| * | | | | Use gitaly 0.112.0Jacob Vosmaer2018-07-111-1/+1
| | | | | |
* | | | | | Merge branch 'add-back-mr-diff-deletion-migration' into 'master'Yorick Peterse2018-07-116-54/+224
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add back MR diff deletion migration See merge request gitlab-org/gitlab-ce!20331
| * | | | | | Use schedulers and delete diff files upon deadtuples checkOswaldo Ferreira2018-07-106-76/+119
| | | | | | |
| * | | | | | Remove unnecessary EachBatchOswaldo Ferreira2018-07-101-4/+0
| | | | | | |
| * | | | | | Reschedule DeleteDiffFiles until there is none left to removeOswaldo Ferreira2018-07-103-33/+67
| | | | | | |
| * | | | | | Wait postgresql vacuum of deadtuples on merge_request_diff_files deletionOswaldo Ferreira2018-07-106-180/+87
| | | | | | |
| * | | | | | Add 1000 files per minute deletion ratio on schedulerOswaldo Ferreira2018-07-106-100/+112
| | | | | | |
| * | | | | | Create a diff deletion worker scheduler to avoid long-running post-migrationOswaldo Ferreira2018-07-104-43/+94
| | | | | | |
| * | | | | | Schedule batches in bulks of 5 diffsOswaldo Ferreira2018-07-102-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issuing 6M writings in a N+1 manner in Redis takes time, 3 hours to be precise. This commit makes it schedule 5 jobs at a time, what should make it schedule every job in approximately 40 minutes
| * | | | | | Revert "Temporarily remove MR diffs removal migration"Sean McGivern2018-07-103-1/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 15ec6a13eb4d839d252315bf5b0a50d28351cb5f.
* | | | | | | Merge branch 'gitaly-mandatory-20180711-jv' into 'master'Sean McGivern2018-07-114-223/+96
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove last Gitaly flags from Blob and Workhorse Closes gitaly#798, gitaly#529, and gitaly#875 See merge request gitlab-org/gitlab-ce!20551
| * | | | | | | Remove last flags from Blob and WorkhorseJacob Vosmaer2018-07-114-223/+96
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'docs/cluster-permissions' into 'master'Marcia Ramos2018-07-111-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention admin privileges for k8s token creation Closes #44457 See merge request gitlab-org/gitlab-ce!20517
| * | | | | | Mention admin privileges for k8s token creationAchilleas Pipinellis2018-07-101-2/+3
| | | | | | |
* | | | | | | Merge branch 'jl-fix-object-storage-support-docs' into 'master'Marcia Ramos2018-07-111-7/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix object storage support notes See merge request gitlab-org/gitlab-ce!20344
| * | | | | | | Fix object storage support notesJoshua Lambert2018-07-111-7/+6
|/ / / / / / /
* | | | | | | Merge branch 'feature/add-docs-verbose-logging' into 'master'Rémy Coutable2018-07-111-0/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documenation about how to active debug logging for gitlab-pages See merge request gitlab-org/gitlab-ce!20054
| * | | | | | | Add documenation about how to active debug logging for gitlab-pagesDennis Günnewig2018-07-101-0/+18
| | | | | | | |
* | | | | | | | Merge branch '46519-remove-ce-prefix-suffix-in-check-ce' into 'master'bjk/health_helpRémy Coutable2018-07-111-8/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "ee_compat_check should remove `ce-` prefix or `-ce` suffix as ee-specific check" Closes #46519 See merge request gitlab-org/gitlab-ce!20532
| * | | | | | | | Find the EE branch by searching the branchesLin Jen-Shin2018-07-111-8/+20
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This uses a similar approach in ee_specific_check.rb
* | | | | | | | Merge branch 'runners-max-timeout-param' into 'master'Rémy Coutable2018-07-113-1/+69
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing maximum_timeout parameter Closes #48625 See merge request gitlab-org/gitlab-ce!20355
| * | | | | | | Add missing maximum_timeout parametergfyoung2018-07-113-1/+69
|/ / / / / / /
* | | | | | | Merge branch 'rails5-autoload' into 'master'Sean McGivern2018-07-111-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Permit concurrent loads Closes #48263 See merge request gitlab-org/gitlab-ce!20473
| * | | | | | | [Rails5] Permit concurrent loadsJan Provaznik2018-07-101-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5 introduced a new (and safer) autoload mechanism which uses locking when loading missing constants. Under some circumstances it's possible that a deadlock occurs in multi-threaded environment (especially when running capybara tests) To avoid these deadlocks, concurrent load is enabled when loading policies - we ere hitting timeout in this case: https://gitlab.com/gitlab-org/gitlab-ce/issues/48263 Note that autoloading is enabled only in development or test envs (not in production).
* | | | | | | | Merge branch 'fix-doc-on-migration' into 'master'Sean McGivern2018-07-111-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix doc for large table column rename See merge request gitlab-org/gitlab-ce!20544
| * | | | | | | | Fix doc for large table column renameMark Chao2018-07-111-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'sh-handle-colons-in-url-passwords' into 'master'James Lopez2018-07-113-1/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly handle colons in URL passwords Closes #49080 See merge request gitlab-org/gitlab-ce!20538
| * | | | | | | Properly handle colons in URL passwordsStan Hu2018-07-103-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before b46d5b13ecb8e0c0793fa433bff7f49cb0612760, we relied on `Addressable::URI` to parse the username/password in a URL, but this failed when credentials contained special characters. However, this introduced a regression where the parsing would incorrectly truncate the password if the password had a colon. Closes #49080
* | | | | | | | Merge branch 'sh-fix-git-gc-error-handling' into 'master'Robert Speicher2018-07-102-2/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ArgumentError in GitGarbageCollectWorker Sidekiq job Closes #49096 See merge request gitlab-org/gitlab-ce!20541
| * | | | | | | | Fix ArgumentError in GitGarbageCollectWorker Sidekiq jobStan Hu2018-07-102-2/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Gitaly call failed, the exception handling failed because `method` is expected to have a parameter. Closes #49096
* | | | | | | | Merge branch 'winh-speedup-smartinterval-tests' into 'master'48657-persist-auto-devops-banner-dismissal-per-user-cookieMike Greiling2018-07-103-99/+130
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Mock timeouts and Promise in SmartInterval tests See merge request gitlab-org/gitlab-ce!20496
| * | | | | | | Mock timeouts and Promise in SmartInterval testsWinnie Hellmann2018-07-103-99/+130
|/ / / / / / /
* | | | | | | Merge branch 'bvl-remove-pot-timestamps' into 'master'Rémy Coutable2018-07-102-3/+7
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove timestamps from `locale/gitlab.pot` Closes #49077 See merge request gitlab-org/gitlab-ce!20533
| * | | | | | Remove timestamps from `locale/gitlab.pot`Bob Van Landuyt2018-07-102-3/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This will help us avoid conflicts when regenerating the pot file, the timestamps aren't used by Crowdin.
* | | | | | Merge branch 'add-dst-support-to-pipeline-schedule' into 'master'Kamil Trzciński2018-07-102-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add daylight saving time support for pipeline schedules Closes #37165 See merge request gitlab-org/gitlab-ce!20145
View Lorry Controller Status