* 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: (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: (297 commits)
Fix deletion of container registry or images returning an error
The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix:
Decrease ABC threshold to 54.28
Update VERSION to 10.2.0-pre
Update CHANGELOG.md for 10.1.0
Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`
Fix the external URLs generated for online view of HTML artifacts
Use title as placeholder instead of issue title for reusability
Fix failure in current_settings_spec.rb
Clarify the difference between project_update and project_rename
URI decode Page-Title header to preserve UTF-8 characters
Update Gitaly version to v0.49.0
Decrease Perceived Complexity threshold to 14
Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
Force non diff resolved discussion to display when collapse toggled
Added submodule support in multi-file editor
add note about after_script being run separately
Check for element before evaluate_script
Merge branch 'master-i18n' into 'master'
Update Prometheus gem to fix problems with other files overwriting current file
...
* master: (104 commits)
Update licenses
fix a wrong method call in the refactor
fix a whitespace
fix for discussion
Update templates via:
Update doc accordingly to:
Cache issuable template names
Fix the format of rugged alternate directory list
Match full file path in FileDetector
Fixes from CSS refactor
Resolve "Prometheus service page shows error"
Explicit state integration deletion
Move all API authentication code to APIGuard
Shorten example translation for inclusive language
[ci-skip] add changelog
fix the merger override to remove source branch
add spec
Removed d3.js from the users and graphs bundle
Cleanup data-page attribute after each Karma test
Update template description wording
...
This only appears when in the collapsed sidebar. If the sidebar is expanded, then these items are hidden & no fly-out navigation is displayed.
Closes#36294
There are some redundancies in the validation steps, and that is to
preserve current error messages behavior
Also few specs have to be changed in order to fix madness in validation
logic.
* master: (66 commits)
fix confidential border issue as well as confidential styles leaking on new MR
Migrate force push check to Gitaly
Add option to disable project export on instance
Better categorize test coverage results
Add option to disable project export on instance - db changes
Better caching and indexing of broadcast messages
Include the `is_admin` field in the `GET /users/:id` API when current user is an admin
Document rspec-retry and rspec-flaky
Fix cop description
Retrieve and sync flaky specs report from and to S3
Use a new RspecFlakyListener to detect flaky specs
Fix formatting of patch_versions.md [skip ci]
Enable Timecop safe mode
Show error message for API 500 error in tests, and
Fix merge request diff deserialisation when too_large was absent
Delete correct key from `session` after authenticating using U2F
Bumps omniauth-ldap gem version to 2.0.4
Pending delete projects no longer return 500 error in Admins projects view
Do not run the `ee_compat_check` job for stableish branches
Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.
...
This commit migrates events data in such a way that push events are
stored much more efficiently. This is done by creating a shadow table
called "events_for_migration", and a table called "push_event_payloads"
which is used for storing push data of push events. The background
migration in this commit will copy events from the "events" table into
the "events_for_migration" table, push events in will also have a row
created in "push_event_payloads".
This approach allows us to reclaim space in the next release by simply
swapping the "events" and "events_for_migration" tables, then dropping
the old events (now "events_for_migration") table.
The new table structure is also optimised for storage space, and does
not include the unused "title" column nor the "data" column (since this
data is moved to "push_event_payloads").
== Newly Created Events
Newly created events are inserted into both "events" and
"events_for_migration", both using the exact same primary key value. The
table "push_event_payloads" in turn has a foreign key to the _shadow_
table. This removes the need for recreating and validating the foreign
key after swapping the tables. Since the shadow table also has a foreign
key to "projects.id" we also don't have to worry about orphaned rows.
This approach however does require some additional storage as we're
duplicating a portion of the events data for at least 1 release. The
exact amount is hard to estimate, but for GitLab.com this is expected to
be between 10 and 20 GB at most. The background migration in this commit
deliberately does _not_ update the "events" table as doing so would put
a lot of pressure on PostgreSQL's auto vacuuming system.
== Supporting Both Old And New Events
Application code has also been adjusted to support push events using
both the old and new data formats. This is done by creating a PushEvent
class which extends the regular Event class. Using Rails' Single Table
Inheritance system we can ensure the right class is used for the right
data, which in this case is based on the value of `events.action`. To
support displaying old and new data at the same time the PushEvent class
re-defines a few methods of the Event class, falling back to their
original implementations for push events in the old format.
Once all existing events have been migrated the various push event
related methods can be removed from the Event model, and the calls to
`super` can be removed from the methods in the PushEvent model.
The UI and event atom feed have also been slightly changed to better
handle this new setup, fortunately only a few changes were necessary to
make this work.
== API Changes
The API only displays push data of events in the new format. Supporting
both formats in the API is a bit more difficult compared to the UI.
Since the old push data was not really well documented (apart from one
example that used an incorrect "action" nmae) I decided that supporting
both was not worth the effort, especially since events will be migrated
in a few days _and_ new events are created in the correct format.
Filipa Lacerda
blackst0ne
Dmitriy Zaporozhets
Clement Ho
Kamil Trzcinski
Mike Greiling
Douwe Maan
Guilherme Vieira
Jose Ivan Vargas
Douwe Maan
Mike Greiling
Phil Hughes
Stan Hu
Jacob Schatz
Gabriel Mazetto
Yorick Peterse
Simon Knox