| Age | Commit message (Collapse) | Author |
|---|
|
Ran:
- git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
- git checkout -b 9-2-5-security-patch origin/v9.2.2
- git apply patchfile.patch
- git commit
- [Got the sha ref for the commit]
- git checkout -b upstream-9-2-security master
- git cherry-pick <SHA of the patchfile commit>
- [Resolved conflicts]
- git cherry-pick --continue
|
|
|
|
Migrate pipeline stages in the database
See merge request !11714
|
|
Add Prometheus metrics endpoint and basic infrastructure to meter code
See merge request !11553
|
|
Support descriptions for snippets
Closes #31894
See merge request !11071
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
defaulting to false
|
|
|
|
|
|
|
|
|
|
Creates an index in ci_stages before migrating pipeline stages from
ci_builds, to improve migration performance.
|
|
|
|
|
|
* master: (524 commits)
Improve user experience around slash commands in instant comments
Fix LFS timeouts when trying to save large files
retryable? is now available for CommitStatus
Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables"
Fix test failures
Add slugify project path to CI enviroment variables
Fixed typo: craeted -> created
32118 Make New environment empty state btn lowercase
Expose import_status in Projects API
32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon
Fix test failures
Allow manual bypass of auto_sign_in_with_provider
Fix keys seed
Allow users to be hard-deleted from the API
fixup some classnames and media queries
Enable the Style/PreferredHashMethods cop
Lint our factories creation in addition to their build
Don’t schedule workers from inside transactions
Allow scheduling from after_commit hooks
Forbid Sidekiq scheduling in transactions
...
Conflicts:
db/schema.rb
spec/spec_helper.rb
|
|
Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.
See merge request !11478
|
|
Forbid Sidekiq scheduling in transactions
Closes #27233
See merge request !9376
|
|
ConvDev Index
Closes #30469
See merge request !11377
|
|
Gitlab::CurrentSettings.current_application_settings
small code formatting changes
|
|
+ use strip_heredoc to make the text in tests much more readable
|
|
|
|
+ remove unecessarey require
+ fix small formatiing issues
|
|
+ Add spaces for four phases approach
+ fix InfluxDB rename
|
|
+ Cleanup Gemfile
|
|
|
|
|
|
|
|
|
|
* upstream/master: (39 commits)
Resolve "Improve Container Registry description"
Add username parameter to gravatar URL
Fix replying to a commit discussion displayed in the context of an MR
Add fog-aliyun as backup storage provider
Add missing specs
Make sure protected can't be null; Test protected!
Update session cookie key name to be unique to instance in development
Just mention which GitLab version is required
Fix data inconsistency issue for old artifacts by moving them to a currently used path
Fix N+1 queries for non-members in comment threads
Fix rubocop in spec/helpers/diff_helper_spec.rb
Merge two items into one in the doc
Only remove FK if it exists
Maintain notes avatar at smaller breakpoint
Fix pipeline schedule value name in documentation
Add test for Project#protected_for?
Update diff discussion position per discussion instead of per note
Display Shared Runner status in Admin Dashboard
Make sure we're loading the fresh variables
Now secret_variables_for would return the variables
...
|
|
it a bit more robust against missing options,
which we did guard on for some cases.
|
|
Implementation for protected variables
Closes #24196
See merge request !11688
|
|
|
|
|
|
|
|
used path
|
|
Only remove FK if it exists
See merge request !11828
|
|
|
|
* upstream/master: (251 commits)
Don't match email addresses or foo@bar as user references
Revert "Update GITLAB_SHELL_VERSION"
Update GITLAB_SHELL_VERSION
Add feature toggles through Flipper
Change no_limits to limits
Move includes call to scope
Add GitLab Resources to University
Add Documentation for GIT_CHECKOUT variable
Remove entry variable
Do not try to preload Commits when using Note.includes(:noteable)
Ui improvements for count badges and permission badges
Rename the other jobs
Update jobs_spec for changes from builds_spec
Introduce source to pipeline entity
Update docs related to protected actions
Add changelog for protected branches abilities fix
Ask for an example project for bug reports
Center loading spinner in issuable filters
Fix chat commands specs related to protected actions
Fix builds controller specs related to protected actions
...
|
|
|
|
# Conflicts:
# db/schema.rb
|
|
# Conflicts:
# db/schema.rb
|
|
|
|
|
