* master: (293 commits)
Revert changelog entry for removed feature
Revert "Allow CI/CD Jobs being grouped on version strings"
Resolve "Protected branches count is wrong when a wildcard includes several protected branches"
Use standard codequality job
Resolve "Allow the configuration of a project's merge method via the API"
[Rails5] Rename `sort` methods to `sort_by_attribute`
Add better LDAP connection handling
Updated components to PascalCase
Handle invalid params when trying update_username
Move network related app settings to expandable blocks
[Rails5] Update Gemfile.rails5.lock [ci skip]
Update Security Products examples documentation
Backport Gitlab::Git::Checksum to CE
Add changelog
Refactor discussions/notes code
Remove unnecessary section looking in admin settings qa
Explicitly use page context for qa/factory/settings/hashed_storage.rb
Use gitlab_environment because we need:
Allow feature gate removal through the API
Use shard name in Git::GitlabProjects instead of shard path
...
* master: (156 commits)
Make issue boards height calculation clearer and remove magic numbers
Rename `package-qa` in docs
Copyedit CI services docs
Fix dropzone project show
Prettify notes.
Fix "A copy of Gitlab::Metrics::Methods" have been removed error
Add Jupyter Notebook docs
Fixed profile notifications not being editable
Rename manual job to `package-and-qa`
Update vendored gitlab-ci.yml template for auto-devops
Docs: refactor doc general guidelines and style guidelines
Use Gitaly 0.91.0
Add version available info to integrity check rake task docs
Adds the option to override project description on export via API and fixes the project description not being imported
Extract constant for LfsPointerFile::VERSION_LINE
Setup Faraday middleware before adapter
Revert "Merge branch 'update-httparty' into 'master'"
Update Code Quality example documentation
Fix timeouts loading /admin/projects page
OpenShift install docs: Recommend "add-scc-to-user" over "edit scc"
...
* master: (59 commits)
Use Gitaly 0.89.0
Resolve "Hover style for sidebar dropdowns is wrong"
fixed spec
Respect the protocol in `expose_url`
Fix removes source branch text being rendered in merged state
Fix code and wiki search results when filename is non-ASCII
Include the ee/ directory in backtraces
Use GitLab fork of zaproxy
Updates file extensions on Vue docs
fixed note polling not sending updated last fetched at date added spec for polling
Add changelog entry
Use `list.id` for `:key`
Add changelog entry
Update test for change in label dropdown action name
Add `createLabelTitle` & `manageLabelsTitle` props for action string
Add `headerTitle` prop for container header string
Add `isProject` and computed props to for contextual info for dropdown
Add `isProject` mock config
Use label dropdown helper for rendering contextual string
Add helpers for labels dropdown
...
When a project uses fast-forward merging strategy user has
to rebase MRs to target branch before it can be merged.
Now user can do rebase in UI by clicking 'Rebase' button
instead of doing rebase locally.
This feature was already present in EE, this is only backport
of the feature to CE. Couple of changes:
* removed rebase license check
* renamed migration (changed timestamp)
Closes#40301
* master: (200 commits)
Fix issue boards scroll config.
Added multi editor setting on the profile preferences page
fix missing import of timeWeek which would cause errors in prometheus graphs with deployments
Remove downcase from special path helper
Rename db:seed_fu-{pg,mysql} to gitlab:setup-{pg,mysql}
Fix error when viewing diffs without blobs
Moves prettier to dev dependency
Eager load event target authors whenever possible
Do not run ee_compat_check on security branches
Include integration tests in CE/EE testing documentation
41054-Disallow creation of new Kubernetes integrations
Resolve "Resizable file list and commit panel"
Make tooltip placement bottom by default as per design guidelines
Fix groups list icon, timestamp alignment and row height
Avoid leaving a push event empty if payload cannot be created
Move git operations for UpdateRemoteMirrorService into Gitlab::Git
Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::Repository
Move push_remote_branches from Gitlab::Shell to Gitlab::Git::Repository
Update Kubernetes service documentation
fix issue #37843
...
* master: (68 commits)
Last push event widget width for fixed layout
Added 'admin' persona
Docs: move article Artifactory + GL to subject-related folder
Mention GitLab Pages when changing username
Consolidate the docs when changing a repo path
Add docs for automatic redirects when renaming namespaces
move "Transfer an existing project into a group" to project docs
Do not show Vue pagination if only one page
Resolve "Decouple multi-file editor from file list"
Update Ruby version to 2.3.6
Skip projects filter on merge requests search
Fall back to the `MergeRequestWidgetEntity`
LDAP extern_uids are not normalized when updated via API
organise content by subject
Restore missing language code in datetime_utility.js
Add support for defining explicit dependencies to QA factories
Document mounting volumes with Docker-in-Docker
add missing word to pawel-reduce_cardinality_of_prometheus_metrics.yml
Use seconds where possible, and convert to milliseconds for Influxdb consumption
update dispatcher to allow for dynamic imports until webpack plugin is updated
...
Clement Ho
Filipa Lacerda
blackst0ne
Rémy Coutable
Semyon Pupkov
George Tsiolis
Grzegorz Bizon
Douwe Maan
Dmitriy Zaporozhets
Sean McGivern
Nick Thomas
Tim Zallmann
Takuya Noguchi
Annabel Dunstone Gray
Robert Speicher
Winnie Hellmann
Mike Greiling
🙈 jacopo beschi 🙉
Kamil Trzciński
Jan Provaznik
Stan Hu