| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
Removes ce to ee differences for snowplow file
|
|
|
|
|
| |
Excludes MR author from gitlab_ui and single_codebase Review roulette
results.
|
| |
|
|
|
|
| |
long words
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously the frontend assumed that the user had to be able to merge to
that project in order to resolve conflicts. However, this is overly
restrictive, as the user only has to be able to push to the source
branch. In fact, appending the text /conflicts to the merge request
would bring up the conflict resolution page.
This confusion happens when a project contains a protected branch that
only allows maintainers to push. Users with Developer access no longer
have permission to merge, but they still can create branches in that
project.
To fix this issue, we now loosen the permission check for the "Resolve
conflicts" button and only check for access to push to the source
branch. This is consistent with what the backend does in
MergeRequests::Conflicts::ListService#can_be_resolved_by?.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47954
|
|
|
|
|
| |
Due to a bug, some pool_repositories in production have a null
source_project_id column. This migration aims to fix those rows.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
|
|\
| |
| |
| |
| | |
Add EE backport for the admin view
See merge request gitlab-org/gitlab-ce!29268
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Moves table pagination component
Closes #62788
See merge request gitlab-org/gitlab-ce!29543
|
| | |
| | |
| | |
| | |
| | |
| | | |
Move the table paginaiton component under the
new pagination folder in vue shared components
and updates all the paths
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Expose default_git_depth via project API
Closes #62908
See merge request gitlab-org/gitlab-ce!29353
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Enable Get and Update of ci_default_git_depth for
Project API.
Renaming Project#default_git_depth to :ci_default_git_depth
to give more context through the API usage.
Add API documentation
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
CE backport for gitlab-org/gitlab-ee!12156: Update the merge request widget's "Merge" button to support merge trains
See merge request gitlab-org/gitlab-ce!27594
|
| | |_|/
| |/| |
| | | |
| | | |
| | | | |
This commit updates the merge request widget's "Merge" button to
support merge trains.
|
|\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
'62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard' into 'master'
Resolve "Target area for dropdown list items is too small on Metrics Dashboard"
Closes #62300
See merge request gitlab-org/gitlab-ce!29458
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Document that milestones and labels are still accesible
through direct links when issues are disabled even if
links are missing in sidebar UI.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
**How?**
It looks like when assignees are clicked, the child of the `<a>`.
We fix our propogation check by looking at `.closest` which traverses
through the element itself and parent.
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Revert "Automatically update MR merge-ref along merge status"
See merge request gitlab-org/gitlab-ce!29492
|
| | | | | |
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Creates pagination component graphql
Closes #62788
See merge request gitlab-org/gitlab-ce!29277
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
creates a pagination component for
the graphql api
|
|\ \ \ \ \
| |_|_|/ /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix pipeline schedule when owner is nil
Closes gitlab-com/gl-infra/production#805 and #63086
See merge request gitlab-org/gitlab-ce!29477
|
| | |/ /
| |/| |
| | | |
| | | | |
Fixing the bug
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Ignore legacy artifact columns in Project Import/Export
Closes #63033
See merge request gitlab-org/gitlab-ce!29427
|
| | | | |
| | | | |
| | | | |
| | | | | |
Ignore some columns
|
|\ \ \ \ \
| |_|_|_|/
|/| | | |
| | | | |
| | | | | |
Add LFS blob IDs to GraphQL tree type
See merge request gitlab-org/gitlab-ce!28666
|
| | | | | |
|
|\ \ \ \ \
| |_|_|/ /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix UTF-8 conversion issues when resolving conflicts
Closes #63062
See merge request gitlab-org/gitlab-ce!29453
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/63030,
when the commit message in the /resolve_conflicts endpoint contains a
UTF-8 character, the conversion to the Gitaly ASCII-8BIT value may flag
an error. To fix this, we run `force_encoding` on the commit message.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63062
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Allow references to labels and milestones to contain emoji
Closes #37762, #53756, and #40728
See merge request gitlab-org/gitlab-ce!29284
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If we put the emoji filter before the reference filters, each emoji will
have a wrapper element that prevents the reference filter from detecting
the presence of the emoji.
As the emoji filter now runs after the reference filters, references
must contain a literal emoji, not the GitLab Flavored Markdown
versions (:100`, for example).
A weird side-effect is that if you have a label with the 100 emoji, and
a label named :100:, then trying to reference the latter will work (link
to the correct label), but will render with the 100 emoji. I'm
comfortable with that edge case, I think.
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Handle encoding errors for MergeToRefService
See merge request gitlab-org/gitlab-ce!29440
|
| | | | | | | |
|
|/ / / / / /
| | | | | |
| | | | | |
| | | | | | |
Add change log
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Cancel Auto Merge when target branch is changed
See merge request gitlab-org/gitlab-ce!29416
|
| | |_|_|/ /
| |/| | | |
| | | | | |
| | | | | | |
When target branch is updated, Auto Merge should be canceled.
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Use grid and correct border radius for status badge
See merge request gitlab-org/gitlab-ce!29420
|
| | | | | | | |
|