| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
Often live traces are removed even though the archived trace
doesn't exist. This commit checkes the existence strictly.
|
| |\
| |
| |
| |
| | |
Remove duplicated mapping key in config/locales/en.yml
See merge request gitlab-org/gitlab-ce!30980
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The "errors" section was defined twice in this file, the first one was
the once being removed here, another one is at line 164 (before removal)
or line 158 (after removal).
The content of duplicated strings definition are totally the same, the
second part has more data (41 lines in total, compare to the removed 6
lines), so I removed the first part but not the second part.
cc !16710
|
| |\ \
| | |
| | |
| | |
| | | |
Support remove source branch on merge w/ push options
See merge request gitlab-org/gitlab-ce!30728
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Let's move shared code between create_params and update_params
into a new base_params.
update_params becomes very thin, but it still may be clearer that
the params are being shared if we have a method called
base_params, rather than have create_params merge in
update_params.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
MergeRequests::PushOptionsHandlerService has been updated to allow
creating and updating merge requests with the
`remove_source_branch` set using git push options.
To create a new merge request and set it to remove the source branch
when it is merged:
git push -u origin -o merge_request.create \
-o merge_request.remove_source_branch
To update an existing merge request and set it to remove the source
branch when it is merged:
git push -u origin -o merge_request.remove_source_branch
Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
Bring backward compatibility for request profiles
See merge request gitlab-org/gitlab-ce!30956
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It seems that we missed the backward compatibility support
for profiles in the existing folder.
This commit also fixes some specs to be idempotent
and work in a temporary directory which not always
seems to be the case.
This commit also brings the profile_spec.rb which seems
to be missing.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
Updates all our stylelint dependencies
See merge request gitlab-org/gitlab-ce!31028
|
| |/ / /
| | |
| | |
| | |
| | | |
Removed stylelint-error-string-formatter
as this was having a circular reference fail
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
Resolve difference in app/assets/stylesheets/application.scss
See merge request gitlab-org/gitlab-ce!31007
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Port common class only used in EE
See merge request gitlab-org/gitlab-ce!31008
|
| | | |_|/
| |/| | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
hoverable area on collapsed sidebar icons
Closes #61207
See merge request gitlab-org/gitlab-ce!30974
|
| |/ / / / |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
CE-EE parity for pipelines development fixture
See merge request gitlab-org/gitlab-ce!30870
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We also scope the `rescue`s to only those raised by ActiveRecord, which
would have allowed us to spot this logic error sooner.
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Update GitLab Runner Helm Chart to 0.7.0/12.1.0
See merge request gitlab-org/gitlab-ce!30950
|
| | | | | | | |
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Update webpack-bundle-analyzer to 3.3.2
See merge request gitlab-org/gitlab-ce!31035
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This is needed to fix an issue where updating to the latest Webpack
causes an acorn dependency error:
https://github.com/webpack-contrib/webpack-bundle-analyzer/issues/245
Seen while trying to update dependencies for Mermaid in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30985
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Docs: Update old SAML settings screenshot
See merge request gitlab-org/gitlab-ce!31031
|
| |/ / / / / / |
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QA: Prefer `flat_map` over `map` + `flatten`
See merge request gitlab-org/gitlab-ce!30883
|
| |/ / / / / / |
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Port EE specific settings to CE
See merge request gitlab-org/gitlab-ce!30998
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Fix xterm CSS not loading
Closes #64091
See merge request gitlab-org/gitlab-ce!31023
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Convert githost.log to JSON format
See merge request gitlab-org/gitlab-ce!30967
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This will make it easier to parse this in production and adds the
`correlation_id` if available.
|
| |\ \ \ \ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Adds cluster_for_group factory for convenience
See merge request gitlab-org/gitlab-ce!30826
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Also means we don't have to resort to an update statement to set parent
for child groups who also have clusters.
This is much shorter than
```
create(:cluster, :provided_by_gcp, :group, groups: [group])
```
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Fix wrong name of params in events controller
See merge request gitlab-org/gitlab-ce!30738
|
| |/ / / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Add cr remarks
Add cr remarks
|
| |\ \ \ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Resolve remaining import export differences
See merge request gitlab-org/gitlab-ce!31012
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This backports remaining import/export spec changes from EE to CE.
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This backports all changes made to an import/export fixture file from EE
to CE.
|
| |\ \ \ \ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Use debian based node images for qa tests
Closes #64930
See merge request gitlab-org/gitlab-ce!31020
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The alpine images do not contain a full build toolchain, so if the
pre-compiled node-sass bindings cannot be downloaded, they will error
and break master. By switching to the debian based images, we are able
to compile in case the downloads are not available.
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Fix translation of 'Updated' term in projects list
See merge request gitlab-org/gitlab-ce!30958
|
| | | | | | | | | | |
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Dry the list of stage and group labels by linking to them directly
See merge request gitlab-org/gitlab-ce!30365
|
| | | |_|_|_|_|/ / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |\ \ \ \ \ \ \ \ \
| |_|_|_|_|_|/ / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Remove duplicate entry from all_models.yml
See merge request gitlab-org/gitlab-ce!31010
|
| | | |_|/ / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This line is already present further down in the YAML file. In EE the
line is already removed.
|
| |\ \ \ \ \ \ \ \
| |_|_|/ / / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
'64870-can-t-save-pages-domain-form-with-let-s-encrypt-enabled-if-current-certificate-is-outdated' into 'master'
Resolve "Can't save pages domain form with Let's Encrypt enabled if current certificate is outdated"
Closes #64870
See merge request gitlab-org/gitlab-ce!30995
|
