Age | Commit message (Collapse) | Author |
|
* master:
Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"
Group level labels can be used in subgroups and projects
Disable Sidekiq feature flag check if features table does not exist
Fixes "introduced in..." syntax
Move default brand title to a method
Adds a reference to the echarts licence file
Add missing license manager change attribution
Upgrade gitlab-ui to latest and approve echarts dependency
Security update of rails to version 4.2.11.
|
|
This reverts commit 1e8f1de034aa9b6a60b640b2b091f60c4d3ba365, reversing
changes made to 62d971129da99936a3cdc04f3740d26f16a0c7a6.
|
|
* master: (235 commits)
Change dropdown divider color to gray-200 (#dfdfdf)
Add feature flag for workhorse content type calculation
Use BFG object maps to clean projects
Update gitaly-proto to v1.3.0
Fix gitlab:web_hook tasks
Introduce Knative Serverless Tab
Sort issues and merge requests in ascending and descending order
Use approximate counts for big tables
Fixed renamed and mode changed diff viewers
Add a changelog
Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'"
Bump the gitaly version to 1.7.0
Resolve "Can add an existing group member into a group project with new permissions but permissions are not overridden"
Expose merge request pipeline variables
Fixture for forks
Add an 'How-To' section to the Review Apps doc
Ensure the default ApplicationSetting record is created first
[QA] Better retrieve job ID for a retried job
Retry the review-{deploy,qa} jobs twice
Optimized file search to work without limits
...
|
|
|
|
Allow internal references to be removed
Closes #19376
See merge request gitlab-org/gitlab-ce!23189
|
|
[CE] Revert Gold Trial MRs
See merge request gitlab-org/gitlab-ce!23619
|
|
Fix gitlab:web_hook tasks
Closes #54975
See merge request gitlab-org/gitlab-ce!23635
|
|
|
|
[master]: Prevent a path traversal attack on global file templates
Closes #2745
See merge request gitlab/gitlabhq!2677
|
|
|
|
|
|
Fixed renamed and mode changed diff viewers not rendering on merge requests
Closes #52607
See merge request gitlab-org/gitlab-ce!23600
|
|
Support unlimited file search in web UI and API
See merge request gitlab-org/gitlab-ce!23553
|
|
|
|
'master'
Update dependency scanning report fixtures
See merge request gitlab-org/gitlab-ce!23542
|
|
Expose merge request pipeline variables
See merge request gitlab-org/gitlab-ce!23398
|
|
|
|
The API permits path traversal characters like '../' to be passed down
to the template finder. Detect these requests and cause them to fail
with a 500 response code.
|
|
Gracefully handle unknown/invalid GPG keys
Closes #54729
See merge request gitlab-org/gitlab-ce!23492
|
|
Renders mode changed and renamed file merge request diff
viewers on the frontend.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52607
|
|
'master'"
This reverts commit 427c1e72194556c9e198659dfff92cb42b31fb62, reversing
changes made to 5aac64a79527afef9ff6b4b1db52a9c01c5d6af6.
|
|
permissions but permissions are not overridden"
|
|
Introduce the following variables
- CI_MERGE_REQUEST_ID
- CI_MERGE_REQUEST_IID
- CI_MERGE_REQUEST_REF_PATH
- CI_MERGE_REQUEST_PROJECT_ID
- CI_MERGE_REQUEST_PROJECT_PATH
- CI_MERGE_REQUEST_PROJECT_URL
- CI_MERGE_REQUEST_TARGET_BRANCH_NAME
- CI_MERGE_REQUEST_SOURCE_PROJECT_ID
- CI_MERGE_REQUEST_SOURCE_PROJECT_PATH
- CI_MERGE_REQUEST_SOURCE_PROJECT_URL
- CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
|
|
This reverts commit e65e184269bb27661c9a20658933e8482aa90b62, reversing
changes made to 646ba2418b630710edeaac94b57d08adf2771257.
# Conflicts:
# lib/gitlab/cache/ci/project_pipeline_status.rb
|
|
'52285-omniauth-jwt-provider-dont-support-rsa-ecdsa-and-other-ppk-algorithms' into 'master'
Support RSA and ECDSA algorithms in Omniauth JWT provider
Closes #52285
See merge request gitlab-org/gitlab-ce!23411
|
|
Encrypt CI/CD builds tokens
Closes #52342
See merge request gitlab-org/gitlab-ce!23436
|
|
Disable Knative for group clusters
See merge request gitlab-org/gitlab-ce!23577
|
|
CE Port of "Setup IDE terminal store for environment checks"
See merge request gitlab-org/gitlab-ce!23575
|
|
Fix deprecation: You are passing an instance of ActiveRecord::Base to find
See merge request gitlab-org/gitlab-ce!23369
|
|
* removed 100 limit on file search results because we
load all results anyway
* expensive processing (parsing match content, utf encoding)
is done only for selected page in paginated output
|
|
|
|
|
|
- This is needed by the Web Terminal to check environment
|
|
An unknown public GPG key will result in a GPGME::Error thrown from gpg,
which would cause an Error 500 on the signatures endpoint.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54729
|
|
Fixed expanding diff commit files
Closes #50662
See merge request gitlab-org/gitlab-ce!23591
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Replace admin sidebar feature spec with view spec
See merge request gitlab-org/gitlab-ce!23551
|
|
Add UsageData for group/project clusters
Closes #54886
See merge request gitlab-org/gitlab-ce!23590
|
|
Use group clusters when deploying (DeploymentPlatform)
See merge request gitlab-org/gitlab-ce!22308
|
|
'50626-searching-users-by-the-admin-panel-wipes-query-when-using-sort' into 'master'
Resolve "Searching users by the admin panel wipes query when using sort"
Closes #50626
See merge request gitlab-org/gitlab-ce!23439
|
|
|
|
Fixed multiple discussions getting added to diff lines
Closes gitlab-ee#8195
See merge request gitlab-org/gitlab-ce!23541
|
|
Improve help and validation sections of maximum build timeout inputs
Closes #49434
See merge request gitlab-org/gitlab-ce!23586
|
|
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50662
|
|
The API permits path traversal characters like '../' to be passed down
to the template finder. Detect these requests and cause them to fail
with a 500 response code.
|
|
|
|
Avoid 500's when serializing legacy diff notes
Closes #54793
See merge request gitlab-org/gitlab-ce!23544
|
|
|
|
[Backport] Extract system check rake task logic
See merge request gitlab-org/gitlab-ce!23395
|
|
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8195
|