Commits · 9814b13efb491e00cceef6dc84ba829d956fc718 · nexedi / gitlab-ce

03 Oct, 2018 17 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-03 · 9814b13e
  GitLab Bot authored Oct 03, 2018
```
# Conflicts:
#	Gemfile.lock
#	Gemfile.rails5.lock
#	scripts/lint-rugged
#	spec/models/namespace_spec.rb

[ci skip]
```
  9814b13e
- 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 'remove-rugged' into 'master' · a5cfacc2
  Douwe Maan authored Oct 03, 2018
```
Remove Gitlab::Git::Repository#rugged

See merge request gitlab-org/gitlab-ce!22039
```
  a5cfacc2
- Merge branch 'docs-jira-update' into 'master' · 2d33579c
  Marcia Ramos authored Oct 03, 2018
```
Port Jira integration documentation update to CE

Closes #50505

See merge request gitlab-org/gitlab-ce!22062
```
  2d33579c
- Merge branch '#51699-time-tracker-naming' into 'master' · fb438b9f
  Phil Hughes authored Oct 03, 2018
```
Fix props name casing in time time tracker vue component

Closes #45977 and #51699

See merge request gitlab-org/gitlab-ce!21889
```
  fb438b9f
- Fix props name casing in time time tracker vue component · 65d7bf20
  Johann Hubert Sonntagbauer authored Oct 03, 2018
  
  65d7bf20
- Merge branch 'add-clipboard-button-to-application-id-and-secret' into 'master' · 474231ea
  Phil Hughes authored Oct 03, 2018
```
Add copy to clipboard button for application id and secret

See merge request gitlab-org/gitlab-ce!21978
```
  474231ea
- Add copy to clipboard button for application id and secret · 8c1568d9
  George Tsiolis authored Oct 03, 2018
  
  8c1568d9
- Merge branch 'ccr/wip_filter' into 'master' · 09f38f8d
  Tim Zallmann authored Oct 03, 2018
```
#13650 added wip search functionality and tests

See merge request gitlab-org/gitlab-ce!18119
```
  09f38f8d
- #13650 added wip search functionality and tests · 38f3d59f
  Chantal Rollison authored Oct 03, 2018
  
  38f3d59f
- Merge branch 'ce-7014-epic-status-tabs' into 'master' · 82ece8ad
  Grzegorz Bizon authored Oct 03, 2018
```
Extract status count key to a method

See merge request gitlab-org/gitlab-ce!22021
```
  82ece8ad
- 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 23 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
- Port jira doc update to ce · 7848e42a
  Mike Lewis authored Oct 02, 2018
  
  7848e42a
- 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
- Remove Gitlab::Git::Repository#rugged and Gollum code · a99bf447
  Alejandro Rodríguez authored Oct 02, 2018
```
Cleanup code, and refactor tests that still use Rugged. After this, there should
be no Rugged code that access the instance's repositories on non-test
environments. There is still some rugged code for other tasks like the
repository import task, but since it doesn't access any repository storage path
it can stay.
```
  a99bf447
- 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