| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master'
Create Kubernetes cluster on GKE from k8s service
Closes #35954
See merge request gitlab-org/gitlab-ce!14470
|
| | |\
| | |
| | |
| | | |
feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
|
| | |\ \
| | | |
| | | |
| | | | |
feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
update_cluster_service_spec.
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
wait_for_cluster_creation_worker_spec.
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | | |
Resolve "Lock issue and merge request"
Closes #18608
See merge request gitlab-org/gitlab-ce!14531
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
18608-lock-issues-v2
# Conflicts:
# db/schema.rb
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
# Conflicts:
# app/assets/javascripts/notes/components/issue_comment_form.vue
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | |_|_|_|_|_|/
|/| | | | | | |
|
| |\ \ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
digitalmoksha/gitlab-ce-feature/verify_secondary_emails
# Conflicts:
# app/controllers/admin/users_controller.rb
# app/controllers/confirmations_controller.rb
# app/controllers/profiles/emails_controller.rb
# app/models/user.rb
# app/services/emails/base_service.rb
# app/services/emails/destroy_service.rb
# app/views/devise/mailer/confirmation_instructions.html.haml
# lib/api/users.rb
# spec/services/emails/destroy_service_spec.rb
|
| | | | | | | | |
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Resolve "Cannot rename a hashed project"
Closes #38202
See merge request gitlab-org/gitlab-ce!14428
|
| | | | | | | | | |
|
| | | | |_|_|_|/
| | |/| | | | |
|
| | |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | |
| | | | | | |
| | | | | | | |
Move Fast-Forward Merge to CE
See merge request gitlab-org/gitlab-ce!14272
|
| | | |\ \ \ \ \ |
|
| | | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
app/models/project.rb
db/schema.rb
|
| | | |\ \ \ \ \ \ \
| | | | |_|_|_|_|/
| | | |/| | | | | |
|
| | | | |_|_|_|/ /
| | |/| | | | | |
|
| | | |_|_|/ / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Because of a change in GitLab 9.5.4 to prevent users from assuming control of
a repository already on disk, the import task broke. Imports would fail with
the message, "There is already a repository with that name on disk".
This change skips the validation when the import is done from the
command-line.
Closes #37682
|
| | | | | | | | |
|
| | | |_|/ / /
| |/| | | |
| | | | | |
| | | | | | |
Closes gitaly#601
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Clear merge requests counter cache after merge
Closes gitlab-ee#3573 and #38344
See merge request gitlab-org/gitlab-ce!14563
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Before this change, the MR counter in the sidebar would be wrong if an MR had
been merged since the last update, but not opened or closed, as merging did not
trigger a counter cache update.
|
| | |/ / / / / |
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Refactor services to match EE signature
See merge request gitlab-org/gitlab-ce!14385
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Clean merge_jid whenever necessary on the merge process
Closes #38476
See merge request gitlab-org/gitlab-ce!14540
|
| | | | |/ / /
| | |/| | |
| | | | | |
| | | | | | |
MergeRequest#merge_jid should be cleaned up whenever we hit a known error on MergeService#execute. This way we can keep track if the MR is really "ongoing" or "stuck"
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Closes gitlab-org/gitlab-ce#34415
|
| | | | | | | |
|
| | |/ / / / |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
make sure it stays confirmed
|
| | | | | | |
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
added "Resend confirmation email" for unverified emails
|
| |/ / / /
| | | |
| | | |
| | | | |
Utilizes the Devise `confirmable` capabilities. Issue #37385
|
| | | | | |
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | | |
Stop using Sidekiq for updating Key#last_used_at
Closes #36663
See merge request gitlab-org/gitlab-ce!14391
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This makes things simpler as no scheduling is involved. Further we
remove the need for running a SELECT + UPDATE just to get the key and
update it, whereas we only need an UPDATE when setting last_used_at
directly in a request.
The added service class takes care of updating Key#last_used_at without
using Sidekiq. Further it makes sure we only try to obtain a Redis lease
if we're confident that we actually need to do so, instead of always
obtaining it. We also make sure to _only_ update last_used_at instead of
also updating updated_at.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36663
|
