| Age | Commit message (Collapse) | Author |
|---|
|
This reverts commit e9d8fc94e6e13f8b2d145f549d4a939ca25a3d93.
|
|
Encoding.default_external was chosen over
Encoding.default_internal because File.read is
returning Encoding.default_external, therefore
we should align with it. Alternatively, we could
force both of them to be Encoding.default_internal.
However, ideally this should be determined by different
projects. For example, some projects might want to use
an encoding different to what GitLab is using.
This might not happen soon though.
Closes #27052
|
|
Copying a rendered issue/comment will paste into GFM textareas as actual GFM
See merge request !8597
|
|
Fix race conditions for AuthorizedProjectsWorker
Closes #26194 and #26310
See merge request !8701
|
|
Fix CI requests concurrency
See merge request !8760
|
|
Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1078
See merge request !8657
|
|
# Conflicts:
# app/assets/javascripts/lib/utils/common_utils.js.es6
|
|
|
|
There were two cases that could be problematic:
1. Because sometimes AuthorizedProjectsWorker would be scheduled in a
transaction it was possible for a job to run/complete before a
COMMIT; resulting in it either producing an error, or producing no
new data.
2. When scheduling jobs the code would not wait until completion. This
could lead to a user creating a project and then immediately trying
to push to it. Usually this will work fine, but given enough load it
might take a few seconds before a user has access.
The first one is problematic, the second one is mostly just annoying
(but annoying enough to warrant a solution).
This commit changes two things to deal with this:
1. Sidekiq scheduling now takes places after a COMMIT, this is ensured
by scheduling using Rails' after_commit hook instead of doing so in
an arbitrary method.
2. When scheduling jobs the calling thread now waits for all jobs to
complete.
Solution 2 requires tracking of job completions. Sidekiq provides a way
to find a job by its ID, but this involves scanning over the entire
queue; something that is very in-efficient for large queues. As such a
more efficient solution is necessary. There are two main Gems that can
do this in a more efficient manner:
* sidekiq-status
* sidekiq_status
No, this is not a joke. Both Gems do a similar thing (but slightly
different), and the only difference in their name is a dash vs an
underscore. Both Gems however provide far more than just checking if a
job has been completed, and both have their problems. sidekiq-status
does not appear to be actively maintained, with the last release being
in 2015. It also has some issues during testing as API calls are not
stubbed in any way. sidekiq_status on the other hand does not appear to
be very popular, and introduces a similar amount of code.
Because of this I opted to write a simple home grown solution. After
all, all we need is storing a job ID somewhere so we can efficiently
look it up; we don't need extra web UIs (as provided by sidekiq-status)
or complex APIs to update progress, etc.
This is where Gitlab::SidekiqStatus comes in handy. This namespace
contains some code used for tracking, removing, and looking up job IDs;
all without having to scan over an entire queue. Data is removed
explicitly, but also expires automatically just in case.
Using this API we can now schedule jobs in a fork-join like manner: we
schedule the jobs in Sidekiq, process them in parallel, then wait for
completion. By using Sidekiq we can leverage all the benefits such as
being able to scale across multiple cores and hosts, retrying failed
jobs, etc.
The one downside is that we need to make sure we can deal with
unexpected increases in job processing timings. To deal with this the
class Gitlab::JobWaiter (used for waiting for jobs to complete) will
only wait a number of seconds (30 by default). Once this timeout is
reached it will simply return.
For GitLab.com almost all AuthorizedProjectWorker jobs complete in
seconds, only very rarely do we spike to job timings of around a minute.
These in turn seem to be the result of external factors (e.g. deploys),
in which case a user is most likely not able to use the system anyway.
In short, this new solution should ensure that jobs are processed
properly and that in almost all cases a user has access to their
resources whenever they need to have access.
|
|
Support notes without a project (personal snippets notes)
See merge request !8468
|
|
Grapify last endpoint of the branches API
See merge request !8755
|
|
|
|
The conflict happens when we try to update a build,
but fail to do so due to fact that we update the same build concurrently for two different runners.
|
|
|
|
|
|
Add redis version to info rake task
See merge request !8283
|
|
|
|
|
|
backport-ee-changes-for-build-minutes
|
|
|
|
Dont persist application settings in test env
See merge request !8715
|
|
'master'
Allows to search within project by commit's hash #24833
Closes #24833
See merge request !8028
|
|
Small update to the Mattermost API
See merge request !8712
|
|
Grapify all endpoints of the deploy keys API
See merge request !8721
|
|
commit found
See !8028 and #24833
|
|
Was proposed in #24833
|
|
These changes make it possible to wrap multiple API requests in one
session.
|
|
Pick security fixes from 8.16.1 et al into master
Closes #26813, #26249, #26259, #26243, #26242
See merge request !8724
|
|
'22619-add-an-email-address-to-unsubscribe-list-header-in-email' into 'master'
Handle unsubscribe notification via email
Closes #22619
See merge request !6597
|
|
Allow creating protected branches when user can merge to such branch
Closes #22638
See merge request !8458
|
|
Prevent users from creating notes on resources they can't access
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2054
|
|
Ensure that only privileged users can access merge requests in the API
See merge request !2053
|
|
Fix users being able to delete instance public deployment keys
See merge request !2049
|
|
adds events to services api deserialization
Closes #22974
See merge request !8324
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing
changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e.
|
|
Use a warning icon for a stage with allowed to fail builds
Closes #21948
See merge request !8503
|
|
|
|
|
|
'master'"
This reverts merge request !8573
|
|
This reverts merge request !8671
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Fix import no longer mapping users as admin
Closes #25346
See merge request !8625
|
|
Don't persist application settings in test env
See merge request !8573
|
|
|
|
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1083
|
|
|
|
|
|
|
