Commits · 73fe7c8cd30f1413da68acdc3348c817691ade7e · nexedi / gitlab-ce

27 Sep, 2018 4 commits
- Merge branch 'ee-ide-refactor-for-ee-specific' into 'master' · 73fe7c8c
  Phil Hughes authored Sep 27, 2018
```
Refactor IDE to allow RightPane extension

See merge request gitlab-org/gitlab-ee!7488
```
  73fe7c8c
- Merge branch 'ce-to-ee-2018-09-26' into 'master' · 07a8cea2
  Stan Hu authored Sep 27, 2018
```
CE upstream - 2018-09-26 15:21 UTC

See merge request gitlab-org/gitlab-ee!7502
```
  07a8cea2
- Refactor IDE to allow RightPane extension · 8969874a
  Paul Slaughter authored Sep 26, 2018
```
**Why?**
- This is needed by the Web Terminal EE feature.
  https://gitlab.com/gitlab-org/gitlab-ee/issues/5426

**Notes:**
- RightPane component tabs is now data driven.
```
  8969874a
- Resolve conflicts in app/assets/javascripts/vue_merge_request_widget/dependencies.js · bd7db99f
  Stan Hu authored Sep 26, 2018
  
  bd7db99f
26 Sep, 2018 36 commits
- Merge branch 'ee-jivl-fix-monitoring-dashboard-resizing-navbar' into 'master' · b016feab
  Mike Greiling authored Sep 26, 2018
```
EE - Fix monitoring dashboard not working properly

See merge request gitlab-org/gitlab-ee!7377
```
  b016feab
- EE - Fix monitoring dashboard not working properly · 648c3e38
  Jose Ivan Vargas authored Sep 26, 2018
  
  648c3e38
- Merge branch 'weight_quick_action' into 'master' · 372b4654
  Mike Greiling authored Sep 26, 2018
```
Update possible values for weight quick action

See merge request gitlab-org/gitlab-ee!7498
```
  372b4654
- Merge branch 'align-epics-empty-state-buttons' into 'master' · e45d72b4
  Annabel Dunstone Gray authored Sep 26, 2018
```
Resolve "Align epics and roadmap empty state buttons to the center"

Closes #7574

See merge request gitlab-org/gitlab-ee!7358
```
  e45d72b4
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-26 · 16048080
  GitLab Bot authored Sep 26, 2018
```
# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js

[ci skip]
```
  16048080
- Merge branch 'dm-fix-assign-unassign-quick-actions' into 'master' · 82ea7195
  Rémy Coutable authored Sep 26, 2018
```
Don't ignore first action when assign and unassign quick actions are used in the same comment

See merge request gitlab-org/gitlab-ce!21749
```
  82ea7195
- Merge branch 'dm-fix-assign-unassign-quick-actions-ee' into 'master' · 0a30b12b
  Rémy Coutable authored Sep 26, 2018
```
Don't ignore first action when assign and unassign quick actions are used in the same comment [EE]

See merge request gitlab-org/gitlab-ee!7478
```
  0a30b12b
- Merge branch 'patch-29' into 'master' · 85f66f37
  Kamil Trzciński authored Sep 26, 2018
```
ci docs: clarify allow_failure default

See merge request gitlab-org/gitlab-ce!21791
```
  85f66f37
- Merge branch 'rename-squash-before-merge-vue-component' into 'master' · c052f5a9
  Phil Hughes authored Sep 26, 2018
```
Rename squash before merge vue component

See merge request gitlab-org/gitlab-ce!21851
```
  c052f5a9
- Merge branch 'ee-rename-squash-before-merge-vue-component' into 'master' · 003e9254
  Phil Hughes authored Sep 26, 2018
```
Rename squash before merge vue component

See merge request gitlab-org/gitlab-ee!7449
```
  003e9254
- Merge branch 'docs/add-artifact-file-url' into 'master' · a1529944
  Kamil Trzciński authored Sep 26, 2018
```
Add documentation for stable URLs for Artifacts

See merge request gitlab-org/gitlab-ce!21890
```
  a1529944
- Merge branch 'patch-25' into 'master' · 404b7802
  Marcia Ramos authored Sep 26, 2018
```
Docs: one-off typo fix

See merge request gitlab-org/gitlab-ce!21872
```
  404b7802
- Test correct assign and unassign behavior · 119ad568
  Douwe Maan authored Sep 25, 2018
  
  119ad568
- Make using assign and unassign quick actions together work as expected · 7a707573
  Douwe Maan authored Sep 14, 2018
  
  7a707573
- Make using assign and unassign quick actions together work as expected · 8811692c
  Douwe Maan authored Sep 14, 2018
  
  8811692c
- Merge branch 'ce-to-ee-2018-09-26' into 'master' · d728e315
  Filipa Lacerda authored Sep 26, 2018
```
CE upstream - 2018-09-26 12:21 UTC

See merge request gitlab-org/gitlab-ee!7496
```
  d728e315
- update possible values for weight quick action · 50750eb6
  Muhamed Huseinbašić authored Sep 26, 2018
  
  50750eb6
- Merge branch 'mk/backport-fix-safe-request-store-test' into 'master' · cfd2c31b
  Yorick Peterse authored Sep 26, 2018
```
[CE backport] Fix RequestStore-related EE-only test failure

See merge request gitlab-org/gitlab-ce!21915
```
  cfd2c31b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-26 · 256f355b
  GitLab Bot authored Sep 26, 2018
  
  256f355b
- Merge branch 'docs-update-elasticsearch-url' into 'master' · ae2ca2f7
  Achilleas Pipinellis authored Sep 26, 2018
```
Update Elasticsearch URL description with example on using basic auth

Closes #4694

See merge request gitlab-org/gitlab-ee!7490
```
  ae2ca2f7
- Update Elasticsearch URL description with example on using basic auth · 1c2f37d0
  Collen authored Sep 26, 2018
  
  1c2f37d0
- Merge branch 'patch-28' into 'master' · 6c3c76af
  Achilleas Pipinellis authored Sep 26, 2018
```
uploads.md: Fix incorrect path reference

See merge request gitlab-org/gitlab-ce!21901
```
  6c3c76af
- Merge branch 'frozen-string-app-controllers-much-more' into 'master' · 4962bee8
  Rémy Coutable authored Sep 26, 2018
```
Enable even more frozen string in app/controllers

See merge request gitlab-org/gitlab-ce!21919
```
  4962bee8
- Merge branch 'ce-to-ee-2018-09-26' into 'master' · 53bdf916
  Marin Jankovski authored Sep 26, 2018
```
CE upstream - 2018-09-26 09:26 UTC

Closes gitlab-ce#51729

See merge request gitlab-org/gitlab-ee!7489
```
  53bdf916
- Remove empty div for non-authorized users to creaate epics · 964c3f1a
  George Tsiolis authored Sep 26, 2018
  
  964c3f1a
- Align epics and roadmap empty state buttons to the center · 0ad2c115
  George Tsiolis authored Sep 13, 2018
```
- For future reference see gitlab-ce#37867.
```
  0ad2c115
- Merge branch 'patch-29' into 'master' · f1b44437
  Rémy Coutable authored Sep 26, 2018
```
Docs: Update deploy token example to use https

See merge request gitlab-org/gitlab-ce!21720
```
  f1b44437
- Merge branch 'patch-24' into 'master' · 3d8a44c8
  Rémy Coutable authored Sep 26, 2018
```
docs: link to repo check failures

See merge request gitlab-org/gitlab-ce!21829
```
  3d8a44c8
- Merge branch '51839-remove-sorting-on-project-tags' into 'master' · f5665619
  Nick Thomas authored Sep 26, 2018
```
Preserve order of project tags list

Closes #51839

See merge request gitlab-org/gitlab-ce!21897
```
  f5665619
- Preserve order of project tags list · 715221d6
  Dennis Tang authored Sep 26, 2018
  
  715221d6
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-26 · 1d5b8ad2
  GitLab Bot authored Sep 26, 2018
  
  1d5b8ad2
- Merge branch 'fix-gitlab-capitalization-translations-ce' into 'master' · 03e09206
  Rémy Coutable authored Sep 26, 2018
```
Correct GitLab capitalization in CE Translation files

See merge request gitlab-org/gitlab-ce!21832
```
  03e09206
- Merge branch 'fix-gitlab-capitalization-translations-ce-ee' into 'master' · d74b3003
  Rémy Coutable authored Sep 26, 2018
```
Correct GitLab capitalizations in translations - EE Port

See merge request gitlab-org/gitlab-ee!7427
```
  d74b3003
- Merge branch '49329-mr-show-commit-details' into 'master' · 65bc7375
  Phil Hughes authored Sep 26, 2018
```
Resolve "Commit details are not displayed when reviewing an MR commit by commit"

See merge request gitlab-org/gitlab-ce!21784
```
  65bc7375
- Resolve "Commit details are not displayed when reviewing an MR commit by commit" · f3901842
  Paul Slaughter authored Sep 26, 2018
  
  f3901842
- Merge branch 'merge-cpp-junit-documentation-update' into 'master' · c7fcb01b
  Rémy Coutable authored Sep 26, 2018
```
Added cpp documentation for junit integration.

See merge request gitlab-org/gitlab-ce!21916
```
  c7fcb01b