GitLab

When a merge fails due to a locked file, no feedback was given to the
user as to why it failed if the user used the Merge button.  However, if
the push attempt happened directly in the Web UI, the pre-receive
message would be displayed.

To be consistent and to make it clear why a merge failed, we now include
the pre-receive error message in the merge request widget.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10165

We can reduce a significant number of queries by preloading the
associations for events.

On GitLab.com, for a date that had 456 events, this brought the load
time down from 8.7 to 1.2 s.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58392

- Move some specs into contexts
- Let get_slugs method take a parameter and return a specific slug.
- Add rescues when using Addressable::URI.

We are adding sidekiq workers and service classes to allow to rollback
a hashed storage migration. There are some refactoring involved as well
as part of the code can be reused by both the migration and the rollback
logic.

Fix

ok

Add spec

Fix

ok

Fix

Add changelog

Fix

Add memoization

a

fix

Replace tooltip texts in the markdown toolbar with bindings to gettext
calls

Author:    Enrique Alcantara <enrique@crunch.io>

The new spinner is purely CSS
It is used for the loading_icon gitlab-ui component

Since the CTE is faster than a subquery and the only reason we're using
a subquery is that the CTE can't handle sorting by certain attributes,
let's use the CTE always (when the feature flag is enabled) when
counting, since we can ignore ordering if we just want a count of
results.

Signed-off-by: Rémy Coutable <remy@rymai.me>

Port of a community contribution from @glensc to upstream.

Add schema

Add CE counter part

Add default value for

Add changelog

Fix schema

Add test

Fix schema

Fix schema version

Remove default value for

* Add email_header_and_footer_enabled flag to appearances table
* Set email_header_and_footer_enabled default value to false
* Add checkbox to appearance to toggle show header and footer in emails
* Add email_header_and_footer_enabled to allowed params in controller
* Add header and footer messages to the html and text email layouts
* Remove the color styling for emails header and footer
* Add empty_mailer layout for emails without layout,
to have the header and footer applied

Return jQuery element instead of HTML for renderRow for labels select

This reverts commit f5201a81, reversing
changes made to 48e6db0d.

The API get projects/:id/traffic/fetches allows user with write
access to the repository to get the number of clones for the
last 30 days.

Move logic of obtaining Issuable data to separate method

Mousetrap is used as the help-tool to listen to keystrokes

Added currentDiffIndex getter to store that holds
the index of currently active diff file in the list

Instead of computing it on the component, we will take advantage of it
being available for all components in DiffsApp

Testing keyboard navigation and jumpToFile()

source_sha and target_sha are used for merge request pipelines

This commit fixes two problems:

1. When a user clicked on another page, the app would fetch the new page
data but never update because the request and response parameters failed
to match the isEqual check. This was happening because the JSON response
omitted the `nested` attribute, so there was a comparison with a `null`
value.  We fix this by scrubbing undefined values before doing the
comparison.

2. There were duplicate requests made for the environments page because
the success handler of fetchPipelines() would cause the polling
component to make another XHR request.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58191

Added: Specs for the API action

As discussed in https://github.com/mbleigh/acts-as-taggable-on/issues/91,
we can avoid N+1 queries if we use `tags` instead of `tag_list`.

Seen while reviewing
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19740.

This is an issue that can only be seen through EE. Further
details can be seen on
https://gitlab.com/gitlab-org/gitlab-ee/issues/9876. In general
we should always use the latest diff version of a file in order
to both create and apply suggestions.

This reverts merge request !25042

This reverts merge request !25293

Move logic of obtaining Issuable data to separate method

Add a merge_requests/:iid/merge_to_ref API which make
use of the groundwork to write merge results into
refs/merge-requests/:iid/merge.

Adds discussion note style section under notes app from where
user can toggle discussion when they have selected a filter to show
only system notes.

This adds a concern that abstracts the concept of masking a variable,
including the RegEx for validation.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/42382

Signed-off-by: Rémy Coutable <remy@rymai.me>

Ability to filter confidential issues

Closes #50747

See merge request gitlab-org/gitlab-ce!24960