Commits · 98d3f894849131ad0de5bbfa37d4b5640ee79fc5 · nexedi / gitlab-ce

03 Oct, 2018 7 commits
- Merge branch 'ee-remove-rugged' into 'master' · 98d3f894
  Douwe Maan authored Oct 03, 2018
```
Remove Gitlab::Git::Repository#rugged and Gollum code

See merge request gitlab-org/gitlab-ee!7754
```
  98d3f894
- Merge branch 'ce-to-ee-2018-10-03' into 'master' · e8c9a38f
  Filipa Lacerda authored Oct 03, 2018
```
CE upstream - 2018-10-03 03:21 UTC

See merge request gitlab-org/gitlab-ee!7778
```
  e8c9a38f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-03 · 71c30862
  GitLab Bot authored Oct 03, 2018
  
  71c30862
- Merge branch 'docs/refactor-review-apps-documentation' into 'master' · 4fde49d2
  Mike Lewis authored Oct 03, 2018
```
Add more introductory information to Review Apps page, and other refactoring.

Closes #50509

See merge request gitlab-org/gitlab-ce!21632
```
  4fde49d2
- Merge branch 'docs/refactor-geo-documentation' into 'master' · 361824d7
  Mike Lewis authored Oct 03, 2018
```
Refactor Geo documentation landing page

Closes gitlab-ce#50501

See merge request gitlab-org/gitlab-ee!7353
```
  361824d7
- Merge branch 'ce-to-ee-2018-10-03' into 'master' · 532e4aad
  Stan Hu authored Oct 03, 2018
```
CE upstream - 2018-10-03 00:21 UTC

See merge request gitlab-org/gitlab-ee!7777
```
  532e4aad
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-03 · 30679c92
  GitLab Bot authored Oct 03, 2018
  
  30679c92
02 Oct, 2018 33 commits
- Merge branch 'ce-to-ee-2018-10-02' into 'master' · eff4f3af
  Robert Speicher authored Oct 02, 2018
```
CE upstream - 2018-10-02 21:21 UTC

See merge request gitlab-org/gitlab-ee!7775
```
  eff4f3af
- Merge branch 'feature-flags-mvc' into 'master' · 42822a7d
  Clement Ho authored Oct 02, 2018
```
Avoid close icon leaving the modal header

See merge request gitlab-org/gitlab-ce!21904
```
  42822a7d
- Avoid close icon leaving the modal header · 59d4a860
  Winnie Hellmann authored Oct 02, 2018
  
  59d4a860
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-02 · 7ee7beee
  GitLab Bot authored Oct 02, 2018
  
  7ee7beee
- Merge branch 'ce-to-ee-2018-10-02' into 'master' · 2dbed5d6
  Robert Speicher authored Oct 02, 2018
```
CE upstream - 2018-10-02 18:21 UTC

Closes gitaly#1319

See merge request gitlab-org/gitlab-ee!7774
```
  2dbed5d6
- Merge branch 'align-collapsed-sidebar-avatar-container' into 'master' · 9087964c
  Clement Ho authored Oct 02, 2018
```
Align collapsed sidebar avatar container

See merge request gitlab-org/gitlab-ce!22044
```
  9087964c
- Merge branch 'test-against-postgres-96' into 'master' · b609c8f6
  Robert Speicher authored Oct 02, 2018
```
Use minimum recommended PostgreSQL version to run our tests

See merge request gitlab-org/gitlab-ce!22060
```
  b609c8f6
- Resolve locale/gitlab.pot · 4f72e2b1
  Robert Speicher authored Oct 02, 2018
  
  4f72e2b1
- Merge branch 'docs-jira-update-ee' into 'master' · e101ac31
  Mike Lewis authored Oct 02, 2018
```
Documentation: Edits to Jira integration doc

Closes gitlab-ce#50505

See merge request gitlab-org/gitlab-ee!7773
```
  e101ac31
- Resolve qa/qa/page/menu/admin.rb · ebcfdf64
  Robert Speicher authored Oct 02, 2018
  
  ebcfdf64
- Merge branch '7201_remove_condition_on_security_dasbhoard_quick_link' into 'master' · 6bc0aa30
  Robert Speicher authored Oct 02, 2018
```
Remove condition on Security Dashboard quicklink

See merge request gitlab-org/gitlab-ee!7472
```
  6bc0aa30
- Remove condition on Security Dashboard quicklink · 4c43ce1e
  Olivier Gonzalez authored Oct 02, 2018
  
  4c43ce1e
- Use minimum recommended PostgreSQL version to run our tests · e1294022
  Gabriel Mazetto authored Oct 02, 2018
  
  e1294022
- Merge branch 'leipert-frontend-danger' into 'master' · 9ab59100
  Mike Greiling authored Oct 02, 2018
```
Danger checks for the frontend

See merge request gitlab-org/gitlab-ce!21859
```
  9ab59100
- Adjust db/schema.rb conflict · b2fd857a
  Oswaldo Ferreira authored Oct 02, 2018
  
  b2fd857a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-02 · 2b6b7b2e
  GitLab Bot authored Oct 02, 2018
```
# Conflicts:
#	db/schema.rb
#	locale/gitlab.pot
#	qa/qa/page/menu/admin.rb

[ci skip]
```
  2b6b7b2e
- Merge branch 'docs-quick-actions' into 'master' · eda6b43c
  Marcia Ramos authored Oct 02, 2018
```
Docs quick actions - CE

See merge request gitlab-org/gitlab-ce!22058
```
  eda6b43c
- Merge branch 'docs-quick-actions' into 'master' · e672c821
  Marcia Ramos authored Oct 02, 2018
```
Docs quick actions - EE

See merge request gitlab-org/gitlab-ee!7610
```
  e672c821
- Docs quick actions - EE · f3774904
  Victor Wu authored Oct 02, 2018
  
  f3774904
- Refactor quick actions docs into multiple tables · a27ff1cb
  Victor Wu authored Oct 02, 2018
  
  a27ff1cb
- Merge branch 'ce-to-ee-2018-10-02' into 'master' · 9091a5c4
  Robert Speicher authored Oct 02, 2018
```
CE upstream - 2018-10-02 10:46 UTC

See merge request gitlab-org/gitlab-ee!7765
```
  9091a5c4
- Merge branch 'ee-49952-port-upgrade-command-to-ce' into 'master' · 76faa18c
  Kamil Trzciński authored Oct 02, 2018
```
Port UpgradeCommand to CE

See merge request gitlab-org/gitlab-ee!7526
```
  76faa18c
- Merge branch '49952-port-upgrade-command-to-ce' into 'master' · 607f263c
  Kamil Trzciński authored Oct 02, 2018
```
Port UpgradeCommand to CE

See merge request gitlab-org/gitlab-ce!21949
```
  607f263c
- Edits to Jira integration doc · 9fb0c7b1
  Mike Lewis authored Oct 02, 2018
  
  9fb0c7b1
- Merge branch '7125-refactor-code-quality-similar-to-junit-tests-ce' into 'master' · cfc72c12
  Kamil Trzciński authored Oct 02, 2018
```
CE Resolve "Refactor code quality similar to JUnit tests"

See merge request gitlab-org/gitlab-ce!21932
```
  cfc72c12
- CE Resolve "Refactor code quality similar to JUnit tests" · 48c911b7
  Matija Čupić authored Oct 02, 2018
  
  48c911b7
- Merge branch '51782-fix_rename_login_namespace_migration' into 'master' · c0a982fa
  Sean McGivern authored Oct 02, 2018
```
Resolve ""update_column_in_batches can not be run inside a transaction" during upgrade to 11.3"

Closes #51782

See merge request gitlab-org/gitlab-ce!22055
```
  c0a982fa
- Merge branch '50161-hide-close-mr-button-when-merged' into 'master' · d4736a57
  Rémy Coutable authored Oct 02, 2018
```
Hides Close MR button on merged MR

Closes #50161

See merge request gitlab-org/gitlab-ce!21840
```
  d4736a57
- Merge branch 'label-event-migration-ee' into 'master' · b5757b49
  Robert Speicher authored Oct 02, 2018
```
Make sure that resource_label_event.epic_id exists

Closes #7705

See merge request gitlab-org/gitlab-ee!7460
```
  b5757b49
- Resolve spec/finders/issues_finder_spec.rb · 70cdaa7c
  Robert Speicher authored Oct 02, 2018
  
  70cdaa7c
- Resolve app/assets/javascripts/projects/project_new.js · d906f8e6
  Robert Speicher authored Oct 02, 2018
  
  d906f8e6
- Fix rename_login_root_namespaces post migration · 37d5a604
  Mario de la Ossa authored Oct 02, 2018
  
  37d5a604
- Merge branch 'ce-7763-failure-in-geo-rb' into 'master' · bf37ff07
  Douglas Barbosa Alexandre authored Oct 02, 2018
```
[QA] Improve admin hashed-storage settings

See merge request gitlab-org/gitlab-ce!22045
```
  bf37ff07