summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Log push output on exception"mk/remove-push-output-loggingMichael Kozono2018-07-111-18/+6
| | | | This reverts commit d493c91d21250e0b94a14f1808fcf8bb6f1a8d03.
* Merge branch ↵Grzegorz Bizon2018-07-112-1/+5
|\ | | | | | | | | | | | | | | | | '49021-preserve-test-run-artifacts-when-running-gitlab-qa-multiple-times' into 'master' Resolve "Preserve test run artifacts when running gitlab-qa multiple times" Closes #49021 See merge request gitlab-org/gitlab-ce!20495
| * [QA] Ensure screenshots are save in subfolder per QA runRémy Coutable2018-07-112-1/+5
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'sh-truncate-changelog-filenames' into 'master'Robert Speicher2018-07-112-4/+24
|\ \ | | | | | | | | | | | | Truncate filenames created by bin/changelog to 140 characters See merge request gitlab-org/gitlab-ce!20556
| * | Truncate filenames created by bin/changelog to 140 charactersStan Hu2018-07-112-4/+24
| | |
* | | Merge branch 'fix-mr-widget-border' into 'master'Filipa Lacerda2018-07-112-7/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix MR widget border See merge request gitlab-org/gitlab-ce!20562
| * | | Fix MR widget borderAnnabel Dunstone Gray2018-07-112-7/+1
| | |/ | |/|
* | | Merge branch 'revert-todos-epic' into 'master'Yorick Peterse2018-07-1130-640/+184
|\ \ \ | |/ / |/| | | | | | | | Revert "Merge branch 'ee-5481-epic-todos' into 'master'" See merge request gitlab-org/gitlab-ce!20560
| * | Revert "Merge branch 'ee-5481-epic-todos' into 'master'"Jarka Kadlecová2018-07-1130-640/+184
|/ / | | | | | | | | This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489.
* | Merge branch 'fix-no-method-error-on-nil' into 'master'Kamil Trzciński2018-07-112-1/+21
|\ \ | | | | | | | | | | | | Fix an exception seen using the online terminal See merge request gitlab-org/gitlab-ce!18299
| * | Fix an exception seen using the online terminalNick Thomas2018-07-112-1/+21
| | |
* | | Merge branch '48237-toggle-file-comments' into 'master'Phil Hughes2018-07-1114-92/+378
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Toggle file comments in merge request does not update toggle buttons" Closes #48237 and #48537 See merge request gitlab-org/gitlab-ce!20452
| * | | Adds specs for toggleFileDiscussions actionFilipa Lacerda2018-07-112-3/+45
| | | |
| * | | Adds specs for getters in merge request vuex diff moduleFilipa Lacerda2018-07-113-95/+30
| | | |
| * | | Merge branch 'master' into 48237-toggle-file-commentsFilipa Lacerda2018-07-10319-1960/+2700
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (38 commits) Update bitbucket.md to fix typo and small grammar touchups. Update time_helper.rb to fix output for exact minutes. Document update for GitLab Pages users. Support manually stopping any environment from the UI Fix link to frontend in handbook Shorten CHANGELOG filename to avoid breaking ecryptfs users Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml Fix mountComponent helper path in docs Fix #48537 - Update avatar only via the projects API Add additional headline for Adding SSH keys to GitLab Request to be a proofreader. Fix specs Fix search bar text input alignment Fix API docs on unauthenticated projects return Adds with_projects optional parameter to /groups/:id API endpoint Docs: make it clear that you need a completely separate domain for Pages Document that we don't want to wait in tests Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor Remove useless return Use latest gitlab-styles ...
| * | | | Fixes toggle discussion button not expanding collapsed discussionsFilipa Lacerda2018-07-107-6/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussions were being toggled by jquery DOM querying them and toggling visibility but in vue, only the open discussions will be in the DOM Fix includes: - Adds a getter to the store to get the expanded discussions - Adds an action to collapse a discussion - When the user clicks the button, all data needed is now accessible through a getter and we can dispatch an action to toggle the discussion within the state, instead of showing/hiding with jQuery - Removes hardcoded properties Resolves #48237
| * | | | Removes hardcoded and unused propFilipa Lacerda2018-07-091-4/+0
| | | | |
* | | | | 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
View Lorry Controller Status