Commits · 53e98ffde478f9c6c06edab921e496dc33f11523 · nexedi / gitlab-ce

24 Oct, 2017 10 commits
- [CE->EE] Resolve group routes · 53e98ffd
  Valery Sizov authored Oct 24, 2017
  
  53e98ffd
- Merge branch 'ce_upstream' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream · 40f16c4b
  Valery Sizov authored Oct 24, 2017
  
  40f16c4b
- [CE->EE][ci skip] Resolve conflicts · ed1fb873
  Valery Sizov authored Oct 24, 2017
  
  ed1fb873
- Resolve conflict in lib/backup/manager.rb · b7588443
  Rémy Coutable authored Oct 24, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b7588443
- Resolve conflict in .gitlab-ci.yml · cfd0b420
  Rémy Coutable authored Oct 24, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  cfd0b420
- [CE->EE][ci skip] Resolve conflicts · 3365e3eb
  Valery Sizov authored Oct 24, 2017
  
  3365e3eb
- [CE->EE][ci skip] resolve frontend conflicts · 99db2b9f
  Valery Sizov authored Oct 24, 2017
  
  99db2b9f
- [ci skip]Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream · 7df91873
  Valery Sizov authored Oct 24, 2017
  
  7df91873
- Merge branch 'update-ha-db-docs' into 'master' · 7e8fca42
  Marin Jankovski authored Oct 24, 2017
```
Rename the Alpha PG HA documentation to just the PG HA documentation

See merge request gitlab-org/gitlab-ee!3151
```
  7e8fca42
- Rename the Alpha PG HA documentation to just the PG HA documentation · 41f6edbe
  Ian Baum authored Oct 24, 2017
  
  41f6edbe
23 Oct, 2017 30 commits
- Remove `<script>` and `<template>` from CHANGELOG.md · 82446a2b
  Stan Hu authored Oct 23, 2017
  
  82446a2b
- Merge branch '37860-pipelines-page' into 'master' · 743050ce
  Phil Hughes authored Oct 23, 2017
```
Make pipelines table in MR view usable

See merge request gitlab-org/gitlab-ce!14941
```
  743050ce
- Merge branch '39299-sidebar-links' into 'master' · f94c3917
  Phil Hughes authored Oct 23, 2017
```
Fix CSS in load more participants

Closes #39299

See merge request gitlab-org/gitlab-ce!15005
```
  f94c3917
- Merge branch '35644-refactor-have-http-status-into-have-gitlab-http-status' into 'master' · d5e2f873
  Rémy Coutable authored Oct 23, 2017
```
Refactor `have_http_status` into `have_gitlab_http_status` in the specs

Closes #35644

See merge request gitlab-org/gitlab-ce!14958
```
  d5e2f873
- Merge branch 'ee-35644-refactor-have-http-status-into-have-gitlab-http-status' into 'master' · 6652f967
  Rémy Coutable authored Oct 23, 2017
```
Refactor `have_http_status` into `have_gitlab_http_status` in the specs

See merge request gitlab-org/gitlab-ee!3183
```
  6652f967
- Merge branch 'cs-docs-fixes' into 'master' · b5410a28
  Achilleas Pipinellis authored Oct 23, 2017
```
Simple docs fixes

See merge request gitlab-org/gitlab-ce!15001
```
  b5410a28
- Simple docs fixes · 0011d874
  Connor Shea authored Oct 23, 2017
  
  0011d874
- Merge branch '38869-group-files' into 'master' · 9991bb87
  Phil Hughes authored Oct 23, 2017
```
Removes group_avatar & group_label_subscription from global namespace

See merge request gitlab-org/gitlab-ce!15006
```
  9991bb87
- Merge branch 'docs-fix-delete-merged-branches-typo' into 'master' · a9e4fd01
  Achilleas Pipinellis authored Oct 23, 2017
```
Fix a small typo in the delete merged branches documentation

See merge request gitlab-org/gitlab-ce!15003
```
  a9e4fd01
- Merge branch 'docs-fix-issue-new-branch-format' into 'master' · 8854cd3e
  Achilleas Pipinellis authored Oct 23, 2017
```
Fix the description of the new branch created by an issue's new branch button

See merge request gitlab-org/gitlab-ce!15004
```
  8854cd3e
- Merge branch '39369-document-vue-resource-http' into 'master' · 07354b17
  Phil Hughes authored Oct 23, 2017
```
Moves vue resource docs into a new file & add documentation to handle 204

Closes #39369

See merge request gitlab-org/gitlab-ce!15002
```
  07354b17
- Fix button type · 464b075d
  Filipa Lacerda authored Oct 23, 2017
  
  464b075d
- Changes after review · c2d943a7
  Filipa Lacerda authored Oct 23, 2017
  
  c2d943a7
- Merge branch 'backort_routes_group_routes_from_ee' into 'master' · a441e7a7
  Douwe Maan authored Oct 23, 2017
```
Backport EE changes to group routes

Closes gitlab-ee#3794

See merge request gitlab-org/gitlab-ce!14973
```
  a441e7a7
- Merge branch 'bvl-fix-push-event-service-for-forks' into 'master' · 08a8a3f9
  Douwe Maan authored Oct 23, 2017
```
Only cache the push event for the fork-source when it exists

Closes #39352

See merge request gitlab-org/gitlab-ce!14989
```
  08a8a3f9
- Removes group_avatar & group_label_subscription from global namespace · c9045c00
  Filipa Lacerda authored Oct 23, 2017
  
  c9045c00
- Fix CSS in load more participants · d2848f9d
  Filipa Lacerda authored Oct 23, 2017
  
  d2848f9d
- Fix the description of the new branch created by an issue's new branch button · 67ac0330
  Mark Fletcher authored Oct 23, 2017
  
  67ac0330
- Fix a small typo in the delete merged branches documentation · c626fa25
  Mark Fletcher authored Oct 23, 2017
  
  c626fa25
- Moves vue resource docs into a new file. · 008b6e87
  Filipa Lacerda authored Oct 23, 2017
```
Adds docs regarding handling 204 response
```
  008b6e87
- Merge branch 'fix-escaped-text-replacement' into 'master' · 9931ef4a
  Filipa Lacerda authored Oct 23, 2017
```
Fix escaped text replacement

Closes #37724

See merge request gitlab-org/gitlab-ce!14193
```
  9931ef4a
- Merge branch 'patch-entrypoint-overriding' into 'master' · e744f0be
  Achilleas Pipinellis authored Oct 23, 2017
```
Update using_docker_images and merge_requests docs

See merge request gitlab-org/gitlab-ee!3188
```
  e744f0be
- Update using_docker_images and merge_requests docs · 1237f58d
  Paul authored Oct 23, 2017
  
  1237f58d
- Merge branch 'create-new-branch-repo-editor' into 'master' · 27319ffc
  Filipa Lacerda authored Oct 23, 2017
```
Create new branch from dropdown.

Closes #38485

See merge request gitlab-org/gitlab-ce!14714
```
  27319ffc
- Create new branch from dropdown. · 07a8c543
  Jacob Schatz authored Oct 23, 2017
  
  07a8c543
- Merge branch 'zj-peek-gitaly' into 'master' · 3f9022cf
  Rémy Coutable authored Oct 23, 2017
```
Show Gitaly data in the peek performance bar

Closes #39231

See merge request gitlab-org/gitlab-ce!14949
```
  3f9022cf
- Merge branch 'ee-add-shared-vue-loading-button' into 'master' · b91a75a5
  Filipa Lacerda authored Oct 23, 2017
```
Add loading button -- EE merge edition

See merge request gitlab-org/gitlab-ee!3165
```
  b91a75a5
- Merge branch 'add-shared-vue-loading-button' into 'master' · 5295f23b
  Filipa Lacerda authored Oct 23, 2017
```
Add loading button

See merge request gitlab-org/gitlab-ce!14883
```
  5295f23b
- Merge branch 'patch-8' into 'master' · 02e283ff
  Achilleas Pipinellis authored Oct 23, 2017
```
Update using_docker_images.md

See merge request gitlab-org/gitlab-ce!14988
```
  02e283ff
- Refactor `have_http_status` into `have_gitlab_http_status` in the specs · 273f8556
  Jacopo authored Oct 19, 2017
  
  273f8556