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>

  -  app/assets/javascripts/label_manager.js
  - app/assets/javascripts/main.js
  - app/assets/javascripts/star.js

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>

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

# Conflicts:
#	app/assets/javascripts/label_manager.js
#	app/assets/javascripts/main.js
#	app/assets/javascripts/star.js
#	app/controllers/projects_controller.rb
#	app/views/projects/project_members/index.html.haml
#	doc/development/README.md
#	doc/development/testing_guide/testing_levels.md
#	doc/user/permissions.md
#	spec/helpers/groups_helper_spec.rb
#	spec/mailers/notify_spec.rb
[ci skip]

Fix a feature spec failing only on MySQL

Closes #39003

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

CE Upstream - Monday

Closes gitlab-ce#37534, #3616, #2799, gitlab-design#45, gitlab-design#36, and gitlab-ce#38389

See merge request gitlab-org/gitlab-ee!3098

Add support for markdown preview to group milestones

Closes #30241

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

69da2353

fix the import :milestone from adding the group_id

Closes #35580

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

Use Gitaly's RepositoryService.HasLocalBranches RPC

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

Add sort runners on admin runners

Closes #38720

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

Move callback route(`google_api/auth/callback`) for Oauth under `-`

Closes #38911

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

Simplify project page

Closes #37399 and #38839

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

Developer can create/edit/delete milestones

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

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

QA group name, use hyphens rather than underscores

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

Enable eslint in star and remove from main.js

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

Add troubleshooting for Git v2.11 and up

Closes #2457

See merge request gitlab-org/gitlab-ee!3049

Render EE trial expiration banner under nav

Closes #3604

See merge request gitlab-org/gitlab-ee!3113

Use ES6 modules in labels and labels manager

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

Add image discussion docs

Closes #38879

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

Add note on CE fallback for unlicensed EE instances since 9.4

See merge request gitlab-org/gitlab-ee!3100