This commit includes changes to add `UserAccess#can_create_branch?`
which will check whether the user is allowed to create a branch even
if it matches a protected branch.

This is used in `Gitlab::Checks::BranchCheck` when the branch name
matches a protected branch.

A `push_to_create_protected_branch` ability in `ProjectPolicy` has been
added to allow Developers and above to create protected branches.

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>

Patrick Bajao authored 6 years ago and Nick Thomas committed 6 years ago

When `force` is set to `true` and `start_branch` is set, the
branch will be ovewritten with the new commit based on the
`HEAD` of the `start_branch`.

This commit includes changes to update the `gitaly-proto` gem.

Conflicts:
  doc/ci/variables/README.md
  spec/models/ci/pipeline_spec.rb

Sidekiq jobs frequently spawn long-lived child processes to do work.
In some circumstances, these can be reparented to init when sidekiq is
terminated, leading to duplication of work and strange concurrency
problems.

This commit changes sidekiq so that, if run as a process group leader,
it will forward `INT` and `TERM` signals to the whole process group. If
the memory killer is active, it will also use the process group when
resorting to `kill -9` to shut down.

These changes mean that a naive `kill <pid-of-sidekiq>` will now do the
right thing, killing any child processes spawned by sidekiq, as long as
the process supervisor placed it in its own process group.

If sidekiq isn't a process group leader, this new code is skipped.

We've previously exposed ca_file and ssl_version but there are many
possible options that can be used inside tls_options. Instead of
exposing individual ones, simply expose the entire hash so it can
be passed in and we won't have to add things in the future.

Adjusted a few different areas per Evan R's suggestions within the open
MR for this branch.

fix #58023

docs for adding Saturday for first day of the week
add related settings for Saturday as first day of the week
firstDayOfWeek: Use enumeration, replace day's numbers with corresponding names
make some variables lowercase (follow camelCase)
add CHANGELOG entry

Author:    haghighi_ahmad <haghighi.ahmad@gmail.com>

modified:   app/assets/javascripts/pages/users/activity_calendar.js
modified:   app/helpers/preferences_helper.rb
new file:   changelogs/unreleased/58023-add-Saturday-to-localization-first-day-of-the-week.yml
modified:   doc/api/settings.md
modified:   doc/user/profile/preferences.md
modified:   locale/gitlab.pot
modified:   spec/helpers/preferences_helper_spec.rb

Removed the `/-/health/` typo (results in 404) and adjusted some
formatting.

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>

This brings back some of the changes in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20339.

For users using Gitaly on top of NFS, accessing the Git data directly
via Rugged is more performant than Gitaly. This merge request introduces
the feature flag `rugged_find_commit` to activate Rugged paths.

There are also Rake tasks `gitlab:features:enable_rugged` and
`gitlab:features:disable_rugged` to enable/disable these feature
flags altogether.

Part of four Rugged changes identified in
https://gitlab.com/gitlab-org/gitlab-ce/issues/57317.

This change introduces a support for nesting the includes,
allowing to evaluate them in context of the target,
by properly respecting the relative inclusions and user permissions
of another projects, or templates.