Conflicts:
	app/assets/stylesheets/pages/boards.scss
    app/views/admin/groups/show.html.haml
    app/views/devise/shared/_tabs_ldap.html.haml
	app/views/notify/new_merge_request_email.html.haml
	app/views/projects/commits/_commit.html.haml
	app/views/projects/commits/show.html.haml
	app/views/projects/merge_requests/widget/_open.html.haml
	app/views/projects/project_members/index.html.haml
	config/routes/project.rb
	spec/features/notes_on_merge_requests_spec.rb
	spec/models/project_spec.rb

Re-order update steps in the 8.14 -> 8.15 upgrade guide

Closes #26014

See merge request !8287

Record and show last used date of SSH Keys

See merge request !8113

Fix broken url on group avatar

Closes #26452

See merge request !8464

1. Gems need to be installed before we can run the
  gitlab:workhorse:install task
1. Update gitlab-shell after gitlab-workhorse since it's a manual step
  that needs to be done in `/home/git/gitlab-shell`
Signed-off-by: Rémy Coutable <remy@rymai.me>

Addresses: Issue #13810

1. Adds a last_used_at attribute to the Key table/model
2. Update a key's last_used_at whenever it gets used
3. Display how long ago an ssh key was last used

Fix dead link in Reply by email documentation

Closes #26247

See merge request !8474

Add label to Environments "Date Created" column

Closes #25371

See merge request !8376

Moved the members and groups to single option called members

Closes #25985

See merge request !8281

Re-add Google Cloud Storage as a backup strategy

Closes #26362

See merge request !8481

Improve UX copy docs on capitalization and punctuation

See merge request !8439

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

CE upstream

Closes #1376 and gitlab-ce#26114

See merge request !1014

Fixed failing markdown button tests

See merge request !8471

Fixed edit form authenticity_token call failing the tests

See merge request !8472

[ci skip]

[ci skip]

[ci skip]

With Gitea v1.0.0, notes are imported

See merge request !8298

Added animations to issue boards

Closes #25630

See merge request !8417

Fixed padding and margins for the dropdowns on the members section

Port of 26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task to EE

See merge request !1028

Precompile all frontend test fixtures

Closes #26226

See merge request !8384

Speed up group milestone index by passing group_id to IssuesFinder

See merge request !8363

Whitelist next project names: assets, profile, public

See merge request !8470

Fix 500 errors when creating a user with identity via API

Closes #26295

See merge request !8442

Changed CSS transition property for only values that change

LDAP attributes needs default values

See merge request !8465

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix timezone due date picker

Closes #24253

See merge request !8081

Replace static JavaScript fixtures for u2f

See merge request !8426

26352 Change Profile settings to User / Settings

Closes #26352

See merge request !8453

Squashed commit of the following:

commit f19330e4
Author: Mike Greiling <mike@pixelcog.com>
Date:   Tue Jan 3 16:38:53 2017 -0600

    fix right_sidebar_spec ajax call

commit 7a2a9bb4
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 18:14:33 2016 -0600

    replace Teaspoon fixture methods with jasmine-jquery methods to reduce dependency on Teaspoon

commit 10d483ea
Merge: 5997a86e df5223de
Author: Mike Greiling <mike@pixelcog.com>
Date:   Thu Jan 5 14:10:43 2017 -0600

    Merge branch 'fix-u2f-fixtures' into 26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task

    * fix-u2f-fixtures:
      generate u2f frontend fixtures dynamically
      force utf-8 encoding for prior to fixture parsing to prevent nokogiri issues
      exclude script type=text/template from dom scrubbing

commit df5223de
Author: Mike Greiling <mike@pixelcog.com>
Date:   Tue Jan 3 14:48:37 2017 -0600

    generate u2f frontend fixtures dynamically

commit 8cee3b1d
Author: Mike Greiling <mike@pixelcog.com>
Date:   Tue Jan 3 15:26:14 2017 -0600

    force utf-8 encoding for prior to fixture parsing to prevent nokogiri issues

commit ca404170
Author: Mike Greiling <mike@pixelcog.com>
Date:   Tue Jan 3 10:46:17 2017 -0600

    exclude script type=text/template from dom scrubbing

commit 5997a86e
Author: Mike Greiling <mike@pixelcog.com>
Date:   Mon Jan 2 13:04:10 2017 -0600

    add CHANGELOG entry for !8384

commit d904335d
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 18:25:23 2016 -0600

    make projects.json easier to read

commit 7ae2fe13
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 17:28:51 2016 -0600

    fix dynamic u2f fixtures

commit 5f192c77
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 15:27:40 2016 -0600

    update all frontend tests to point to precompiled fixtures

commit 6370e326
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 14:50:07 2016 -0600

    recursively clean compiled fixtures

commit 2373082e
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 14:47:12 2016 -0600

    create catch-all fixture generator for all static fixtures

commit 4cd962ec
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 14:46:41 2016 -0600

    allow storage of raw string fixtures

Fixed new line being included in bold/italic in GFM form

Closes #25456

See merge request !8086