[ci skip]

[ci skip]

I've moded the instruction to a different place to reflect the timming
it should be executed and prevent issues where the user/group doesn't
exist yet.

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

Add user last activity info

Adds `last_activity_at` info to users to track any activity from the user including any Git operations or logging in into the UI.

This adds a table with a 1-1 relationship with users, that gets updated every time the user logs in or runs any Git operation.

<br />
**Things to check:**

` Projects::GitHttpController` reads:

```ruby
# This file should be identical in GitLab Community Edition and Enterprise Edition
```

with no explanation. With this change, they will diverge as I added a `log_user_activity` method there. Not sure if this is a problem...

<br />

This MR allow us to query the DB for user activity, as requested by https://gitlab.com/gitlab-org/gitlab-ee/issues/1022

### mySQL examples - active users last month:

```sql
SELECT u.username,
       a.last_activity_at
FROM   users u
       INNER JOIN user_activities a
               ON u.id = a.user_id
WHERE  last_activity_at > (SELECT Now() - INTERVAL 1 month) -- INTERVAL '1 MONTH' in postgreSQL
ORDER  BY last_activity_at; 
```

```sql
SELECT Count(*)
FROM   user_activities
WHERE  last_activity_at > (SELECT Now() - INTERVAL 1 month); -- INTERVAL '1 MONTH' in postgreSQL
```

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/1022

See merge request !781

User groups (that can be assigned as approvers)

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

See merge request !743

It uses a user activity table instead of a column in users.
Tested with mySQL and postgreSQL

Convert CHANGELOG-EE to Markdown

All this does is convert the version sections into headers. The list
items shouldn't really be indented by two spaces, but it makes no
difference to the rendering and this way we retain authorship history
for the actual changes.

[ci skip]

Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29

See merge request !804

All this does is convert the version sections into headers. The list
items shouldn't really be indented by two spaces, but it makes no
difference to the rendering and this way we retain authorship history
for the actual changes.

[ci skip]

Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29

Remove ashley since she no longer works here

I'll send another MR to the handbook to add a step to offboarding so we don't miss these in the future.

Which would have been appropriate labels for this?

See merge request !803

Decrease maximum time to wait for a mirror process to finish from 1 day to 2 hours

This MR proposes to decrease the time that GitLab waits before to mark a mirror update process stuck as `failed`.  
Full description of the scenario in #1093  
Now this time is one day. When the problem happens, the user sees during one day that the project was updating from upstream.  
If a project has been updating from a remote for longer than 2 hours, we could conclude that something went wrong, mark the mirror as `failed` and retry next time.

Closes #1093

See merge request !791

Reset Jenkins password if username was left blank

So we not only reset password if URL was changed, but also for username. Also, still require username if a new password was set.

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

See merge request !775

CE to EE following update of `db/schema.rb` with `activerecord_sane_schema_dumper`

Resolved conflicts:

```
UU app/controllers/projects/merge_requests_controller.rb
UU app/helpers/merge_requests_helper.rb
UU app/views/projects/merge_requests/widget/_open.html.haml
UU db/schema.rb
UU doc/README.md
UU spec/lib/extracts_path_spec.rb
UU spec/services/merge_requests/refresh_service_spec.rb
```

See merge request !800

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

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

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

Fix Git access panel for Wikis when Kerberos authentication is enabled

When Kerberos authentication is enabled, the `Git Access` panel for project's Wiki return a 500 Error. Details in #1109   
The MR provides the missing code to generate the Kerberos URL for Wiki projects.  
Closes #1109

See merge request !795

Added documentation chapter for Git attributes

See https://gitlab.com/gitlab-org/gitlab_git/issues/28 for more information.

See merge request !6826

Use activerecord_sane_schema_dumper

## What does this MR do?

EE side of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6827.

> `ActiveRecord::SaneSchemaDumper` modifies the behavior of Rails’ `ActiveRecord::SchemaDumper` so that the generated `db/schema.rb` file doesn’t contain any useless/harmful whitespace column alignment.

## Why was this MR needed?

To reduce potential conflicts in `db/schema.rb` (see https://gitlab.com/gitlab-org/gitlab-ee/issues/715).

See merge request !799

Use activerecord_sane_schema_dumper

## What does this MR do?

> `ActiveRecord::SaneSchemaDumper` modifies the behavior of Rails’ `ActiveRecord::SchemaDumper` so that the generated `db/schema.rb` file doesn’t contain any useless/harmful whitespace column alignment.

## Why was this MR needed?

To reduce potential conflicts in `db/schema.rb` (see https://gitlab.com/gitlab-org/gitlab-ee/issues/715).

See merge request !6827

As discussed in https://gitlab.com/gitlab-org/gitlab_git/issues/28 we'll
need to clearly document the need for .gitattributes files being encoded
using UTF-8.

[ci skip]

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

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

API: New /users/:id/events endpoint

## What does this MR do?

If add a new `/users/:id/events` endpoint to retrieve a user's contribution events. The events returned are filtered so that only the events for projects that the current user can see are returned (similarly to what we do at the controller level).

## Why was this MR needed?

Because it's a nice feature to calculate leaderboards, for instance for #17815.

## What are the relevant issue numbers?

Closes #20866.

See merge request !6771

Add disabled delete button to protected branches

## What does this MR do?
Add's a disabled CSS style for the delete button on protected branches instead of hiding the button

## What are the relevant issue numbers?
Closes #22358

See merge request !6439

Speed up specs for GET /projects/:id/events

## What does this MR do?

Just groups some expectations into a single `it` block. Reduce this particular tests block time by half.

See merge request !6778

Removes inconsistency regarding tagging immediately as merged once you create a …

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #20708

See merge request !6408

Set default_label attribute on weight issue filter.

The label for the "Weight" filter in the issues list is darker than the other filters. 

This MR sets the `default_label` attribute to 'Weight', so that the styles for default labels are applied to "Weight". This is the convention for other filter dropdowns. 

I'm guessing it regressed here 8961364c. The default_label was not set when the weight filter was originally transitioned to the new dropdown (https://gitlab.com/gitlab-org/gitlab-ee/commit/b0639b1fdafd0cf48f1fcdaa8047f7414010e643). I'm guessing some styles were unintentionally cascading to give this the correct look, and were changed.

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

See merge request !794

Added 'Download' button to snippet view

## What does this MR do?

Adds a `Download` button above a snippet.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

Requested in #22811 

## Screenshots (if relevant)

![image](/uploads/59b67aa02cc601c08a18fd60c37797ed/image.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #22811

See merge request !6720