Commits · 589f41d6cbf1b380d9e48e302fe38f5a1d3100c8 · nexedi / gitlab-ce

10 Oct, 2018 1 commit
- Fix disappearing weight input in Firefox · 589f41d6
  Fatih Acet authored Oct 10, 2018
  
  589f41d6
09 Oct, 2018 39 commits
- Merge branch 'ce-to-ee-2018-10-09' into 'master' · 26a24e61
  Robert Speicher authored Oct 09, 2018
```
CE upstream - 2018-10-09 18:24 UTC

Closes gitlab-org/quality/team-tasks#60

See merge request gitlab-org/gitlab-ee!7851
```
  26a24e61
- Resolve conflict in qa/qa/page/admin/menu.rb · 0f43a54f
  Winnie Hellmann authored Oct 09, 2018
  
  0f43a54f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-09 · 2c4a4ca3
  GitLab Bot authored Oct 09, 2018
```
# Conflicts:
#	qa/qa/page/admin/menu.rb

[ci skip]
```
  2c4a4ca3
- Merge branch 'gt-update-wiki-empty-state' into 'master' · 835a2a4c
  Fatih Acet authored Oct 09, 2018
```
Update wiki empty state

See merge request gitlab-org/gitlab-ce!22218
```
  835a2a4c
- Merge branch 'fix-spec-typo' into 'master' · b14abf17
  Douglas Barbosa Alexandre authored Oct 09, 2018
```
Fix a typo in a spec file

See merge request gitlab-org/gitlab-ee!7849
```
  b14abf17
- Merge branch '7938-runners-bug' into 'master' · 8702939a
  Tim Zallmann authored Oct 09, 2018
```
Hides shared runner limit when user has minutes

Closes #7938

See merge request gitlab-org/gitlab-ee!7843
```
  8702939a
- Hides shared runner limit when user has minutes · 205cb0c6
  Filipa Lacerda authored Oct 09, 2018
  
  205cb0c6
- Merge branch 'ce-to-ee-2018-10-09' into 'master' · 84e79476
  Marin Jankovski authored Oct 09, 2018
```
CE upstream - 2018-10-09 15:21 UTC

See merge request gitlab-org/gitlab-ee!7848
```
  84e79476
- Merge branch 'qa-60-reorganize-menu-classes' into 'master' · ca440758
  Rémy Coutable authored Oct 09, 2018
```
Reorganize menu files

Closes gitlab-org/quality/team-tasks#60

See merge request gitlab-org/gitlab-ce!22115
```
  ca440758
- Merge branch 'qa-60-reorganize-menu-classes-ee' into 'master' · fff86c48
  Rémy Coutable authored Oct 09, 2018
```
Reorganize menu classes - EE

See merge request gitlab-org/gitlab-ee!7799
```
  fff86c48
- Fix a typo in a spec file · 4ab8db42
  Nick Thomas authored Oct 09, 2018
  
  4ab8db42
- Merge branch '52399-link-for-rbac-experimental-support-is-going-to-the-wrong-anchor' into 'master' · 2a566202
  Mike Greiling authored Oct 09, 2018
```
Resolve "Link for RBAC (experimental support) is going to the wrong anchor"

See merge request gitlab-org/gitlab-ce!22216
```
  2a566202
- Merge branch '52367-cleanup-web-hooks-columns' into 'master' · 1ac2a3b3
  Rémy Coutable authored Oct 09, 2018
```
Remove unencrypted webhook token and URL columns

Closes #52367

See merge request gitlab-org/gitlab-ce!22199
```
  1ac2a3b3
- Merge branch '52372-pipeline-s-page-shows-vue-error-on-master' into 'master' · 55bd24e4
  Mike Greiling authored Oct 09, 2018
```
Resolve "pipeline's page shows vue error on master"

Closes #52372

See merge request gitlab-org/gitlab-ce!22201
```
  55bd24e4
- Resolve "pipeline's page shows vue error on master" · b675b6b8
  Filipa Lacerda authored Oct 09, 2018
  
  b675b6b8
- Merge branch 'patch-29' into 'master' · 10836664
  Rémy Coutable authored Oct 09, 2018
```
Remove a duplicated word in the README file

See merge request gitlab-org/gitlab-ce!22200
```
  10836664
- Merge branch 'rails5-fix-prometheus-alert-event-spec' into 'master' · f31dd0cd
  Rémy Coutable authored Oct 09, 2018
```
Rails 5: fix presence message validation for prometheus_alert

See merge request gitlab-org/gitlab-ee!7823
```
  f31dd0cd
- Merge branch '52233-harmonize-eslint-prettier' into 'master' · b0b4a0cc
  Fatih Acet authored Oct 09, 2018
```
Resolve "Harmonize prettier and eslint configs"

Closes #52233

See merge request gitlab-org/gitlab-ce!22126
```
  b0b4a0cc
- Resolve "Harmonize prettier and eslint configs" · d7619037
  Mike Greiling authored Oct 09, 2018
  
  d7619037
- Merge branch 'improve-downstream-pipeline-trigger' into 'master' · b46894b1
  Nick Thomas authored Oct 09, 2018
```
Improve downstream pipeline trigger class

See merge request gitlab-org/gitlab-ce!22110
```
  b46894b1
- Merge branch 'ee-52233-harmonize-eslint-prettier' into 'master' · 54898c9e
  Fatih Acet authored Oct 09, 2018
```
EE Port for Resolve "Harmonize prettier and eslint configs"

See merge request gitlab-org/gitlab-ee!7840
```
  54898c9e
- EE Port for Resolve "Harmonize prettier and eslint configs" · 6221ac1d
  Mike Greiling authored Oct 09, 2018
  
  6221ac1d
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-09 · ae25e009
  GitLab Bot authored Oct 09, 2018
  
  ae25e009
- Merge branch 'ce-to-ee-2018-10-09' into 'master' · 1bb8dc76
  Marin Jankovski authored Oct 09, 2018
```
CE upstream - 2018-10-09 13:02 UTC

Closes #7883

See merge request gitlab-org/gitlab-ee!7846
```
  1bb8dc76
- Merge branch 'qa-304-auto-devops-open-live-environment' into 'master' · cf7aea84
  Rémy Coutable authored Oct 09, 2018
```
Assert prod environment is live after Auto Devops

See merge request gitlab-org/gitlab-ce!22131
```
  cf7aea84
- Merge branch '43953-add-troubleshooting-to-github-import' into 'master' · 5dc20e50
  Achilleas Pipinellis authored Oct 09, 2018
```
doc-Resolve "Add Troubleshooting to Github Import"

Closes #43953

See merge request gitlab-org/gitlab-ce!17583
```
  5dc20e50
- Merge branch 'docs-improve-repository_files' into 'master' · 41a79f39
  Achilleas Pipinellis authored Oct 09, 2018
```
Improve the Repository files documentation

See merge request gitlab-org/gitlab-ce!22225
```
  41a79f39
- Refactor GitHub import raketask docs · ac2cd5a4
  Achilleas Pipinellis authored Oct 09, 2018
  
  ac2cd5a4
- Update github_import.md · 813519af
  Davin Walker authored Mar 06, 2018
  
  813519af
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-09 · fdd6953f
  GitLab Bot authored Oct 09, 2018
  
  fdd6953f
- Merge branch 'ce-to-ee-2018-10-09' into 'master' · 32164bf7
  Rémy Coutable authored Oct 09, 2018
```
CE upstream - 2018-10-09 07:18 UTC

See merge request gitlab-org/gitlab-ee!7841
```
  32164bf7
- Improve the Repository files documentation · 33304a8b
  Rémy Coutable authored Oct 09, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  33304a8b
- Merge branch 'qa_spec_admin_cluster_create_cluster_role_binding' into 'master' · 7a21f17d
  Rémy Coutable authored Oct 09, 2018
```
QA: Use basic auth to create cluster role binding

See merge request gitlab-org/gitlab-ce!22190
```
  7a21f17d
- Merge branch 'docs/rs-feature-flag-check-by-default' into 'master' · c1ad8bcb
  Yorick Peterse authored Oct 09, 2018
```
Documentation for feature flags defaulting to on

Closes gitlab-ee#7883

See merge request gitlab-org/gitlab-ce!22157
```
  c1ad8bcb
- Reorganize menu files · b7a5b204
  sliaquat authored Oct 04, 2018
```
Add missed files

Use correct method

Implement review feedback

Add missing frozen_string_literal

Squash 5 commits
```
  b7a5b204
- Fix merge conflict and ee specific reorganization · d96ab972
  sliaquat authored Oct 04, 2018
```
Use correct method

Add missing frozen_string_literal: true

Implement review feedback

Removed extra space

Squash 5 commits
```
  d96ab972
- Merge branch 'tsumitsu-master-patch-1' into 'master' · df0b8b94
  Achilleas Pipinellis authored Oct 09, 2018
```
docs/Tsumitsu Fix render issue in GFM documentation page

See merge request gitlab-org/gitlab-ce!21997
```
  df0b8b94
- docs/Tsumitsu Fix render issue in GFM documentation page · 67a60580
  smit_tooned authored Oct 09, 2018
  
  67a60580
- Merge branch '52408-pip-cache-dir-to-cache-python-dependencies' into 'master' · d56e8b00
  Kamil Trzciński authored Oct 09, 2018
```
Use the standard PIP_CACHE_DIR for Python dependency caching template

Closes #52408

See merge request gitlab-org/gitlab-ce!22211
```
  d56e8b00