| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
MR unmergeable notification
See merge request gitlab-org/gitlab-ce!18042
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
First, transitions between can_be_merged & cannot_be_merged are removed,
as they are currently blocked in `check_if_can_be_merged`.
`can_be_merge` always returns to `unchecked` first,
before it can transition to `cannot_be_merged` (and vice versa).
We want to avoid repeated notification triggered by repeated transition
between `cannot_be_merged` & `unchecked`.
So we added `cannot_be_merged_recheck` state, similar to `unchecked`,
but as a mean to remember it’s from cannot_be_merged.
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407
Since `unchecked` and `cannot_be_merged_recheck` both mean
“we are in the middle of checking if it is mergeable”,
quite often we need to see if merge_status is in either one of them,
so `check_state?` is added to achieve this.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Resolve "Escape key to close MR check out branch modal"
Closes #45850
See merge request gitlab-org/gitlab-ce!19050
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
removed "(Beta)" from "Auto DevOps" messages
See merge request gitlab-org/gitlab-ce!18759
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Resolve "Make explicit that merge conflict feature commits to source branch"
Closes #44895
See merge request gitlab-org/gitlab-ce!18921
|
| | | | | | |
|
| |/ / / / |
|
| |/ / /
| | |
| | |
| | | |
project level
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
UsersController#projects.json sort order
Closes #45065
See merge request gitlab-org/gitlab-ce!18227
|
| | | | | |
|
| | | | | |
|
| |/ / / |
|
| | | | |
|
| |/ / |
|
| | |
| |
| |
| | |
error page"
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Resolve "Add nip.io domain suggestion in the Kubernetes cluster details view"
Closes #45584
See merge request gitlab-org/gitlab-ce!18496
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
'ce-5968-extract-ee-specific-files-lines-for-clusters-related-files' into 'master'
Backport Cluster related EE code
See merge request gitlab-org/gitlab-ce!18931
|
| | | |/
| |/| |
|
| |\ \ \
| |_|/
|/| |
| | |
| | | |
Update wiki page deletion confirmation
See merge request gitlab-org/gitlab-ce!18712
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | | |
rspec analog
|
| | |/
|/|
| |
| | |
rspec analog
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Allow a user to sign out when on the terms page
Closes #46211
See merge request gitlab-org/gitlab-ce!18875
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Before we would block the `sign_out` request when the user did not
accept the terms, therefore redirecting them to the terms again.
By allowing all request to devise controllers, we avoid this problem.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
'blackst0ne-replace-spinach-project-merge-requests-references.feature' into 'master'
Replace the `project/merge_requests/references.feature` spinach test with an rspec analog
See merge request gitlab-org/gitlab-ce!18794
|
| | |/ / |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Enforce terms acceptance before configuring 2FA
Closes #46256
See merge request gitlab-org/gitlab-ce!18896
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
This prevents a redirect loop when a user has to enable 2FA and accept
the terms.
Now they will need to accept the terms, then enable 2FA, or any other requirements.
|
| | | | |
|
| |\ \ \
| |/ /
|/| |
| | |
| | | |
Add 2FA filter to group members page
See merge request gitlab-org/gitlab-ce!18483
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Show 2fa badge on a group members page
* Make group members page UI consistent with project members page
* Fix ambiguous sql in User.with/without_two_factor methods
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |
| | |
| | |
| | | |
analog
|
| | | | |
|
| |/ /
| |
| |
| | |
analog
|
| |\ \
| | |
| | |
| | |
| | | |
Fix failed jobs tab
See merge request gitlab-org/gitlab-ce!18520
|
| | | | |
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Resolve "Display merge commit SHA in merge widget after merge"
Closes #43557
See merge request gitlab-org/gitlab-ce!18722
|
| | |/ / |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Upgrade to Webpack 4
Closes #43400
See merge request gitlab-org/gitlab-ce!17218
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* master: (252 commits)
Upgrade underscore.js
Enable prometheus metrics by default
Add signature verification badge to compare view
Add Changelog
Update instalation from source guide
fix Web IDE file tree scroll issue
Enable quick support actions default
Backport of 4084-epics-username-autocomplete
Remove top margin on the terms page with performance bar
Backports every CE related change from ee-44542 to CE
Fix typo in changelog entry
fix missing space
Backport IdentityLinker#failed? from GroupSaml callback flow
Add ci_cd_settings delete_all dependency on project
AutoDevOps Docs fix invalid external link
Ignore knapsack and rspec_flaky
Ensure web hook 'blocked URL' errors are stored in as web hook logs and properly surfaced to the user
Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runner pages
Reuses `InternalRedirect` when possible
Enforces terms in the web application
...
|
| | | |_|/
| |/| | |
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Improve UX For Group Runners
See merge request gitlab-org/gitlab-ce!18649
|
| | | | | | |
|
