Commits · 1f6444a7a6ba9995c3c42b66a2c4141f237f5bdf · nexedi / gitlab-ce

15 Jan, 2019 40 commits
- Automatic merge of gitlab-org/gitlab-ce master · 1f6444a7
  GitLab Bot authored Jan 15, 2019
  
  1f6444a7
- Merge branch 'twang2218/gitlab-ce-i18n-extract-app/views/search' into 'master' · 99ee6c82
  Lin Jen-Shin authored Jan 15, 2019
```
i18n: externalize strings from 'app/views/search'

See merge request gitlab-org/gitlab-ce!24297
```
  99ee6c82
- Merge branch 'ee-twang2218/gitlab-ce-i18n-extract-app/views/search' into 'master' · b639d939
  Lin Jen-Shin authored Jan 15, 2019
```
[EE] i18n: externalize strings from 'app/views/search'

See merge request gitlab-org/gitlab-ee!9113
```
  b639d939
- Automatic merge of gitlab-org/gitlab-ce master · 6e54f823
  GitLab Bot authored Jan 15, 2019
  
  6e54f823
- Merge branch '44780-wiki-page-with-a-dot-inside-title-slug-leads-to-404-in-the-api' into 'master' · 267ce96e
  Douwe Maan authored Jan 15, 2019
```
Support Wiki pages with dots in slugs

Closes #44780

See merge request gitlab-org/gitlab-ce!24383
```
  267ce96e
- Merge branch 'sh-suppress-duplicate-remote-mirror-notifications' into 'master' · 9cd5c5f5
  Douwe Maan authored Jan 15, 2019
```
Only send one notification for failed remote mirror

Closes #56222

See merge request gitlab-org/gitlab-ce!24381
```
  9cd5c5f5
- Merge branch 'sh-suppress-duplicate-remote-mirror-notifications-ee' into 'master' · 84769a03
  Douwe Maan authored Jan 15, 2019
```
Only send one notification for failed remote mirror (EE port)

Closes gitlab-ce#56222

See merge request gitlab-org/gitlab-ee!9164
```
  84769a03
- Merge branch 'sh-fix-backfill-project-repo-migration' into 'master' · ace4a88a
  Douwe Maan authored Jan 15, 2019
```
Fix duplicate project disk path in BackfillLegacyProjectRepositories

Closes #56061

See merge request gitlab-org/gitlab-ce!24213
```
  ace4a88a
- [i18n] Externalize strings from 'app/views/search' · 527ded1e
  Tao Wang authored Jun 14, 2018
```
Signed-off-by: Tao Wang <twang2218@gmail.com>
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  527ded1e
- [i18n] Externalize strings from 'app/views/search' · 9be9787d
  Tao Wang authored Jun 14, 2018
```
Signed-off-by: Tao Wang <twang2218@gmail.com>
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9be9787d
- Automatic merge of gitlab-org/gitlab-ce master · 8d836d76
  GitLab Bot authored Jan 15, 2019
  
  8d836d76
- Merge branch '55945-suggested-change-preview-highlight' into 'master' · f821a53b
  Kushal Pandya authored Jan 15, 2019
```
Add syntax highlighting to suggestion preview

Closes #55945

See merge request gitlab-org/gitlab-ce!24358
```
  f821a53b
- Add syntax highlighting to suggestion preview · f3b9eda9
  Jacques Erasmus authored Jan 15, 2019
  
  f3b9eda9
- Merge branch 'sh-fix-github-ci-cd-typo-docs' into 'master' · b4203e70
  Achilleas Pipinellis authored Jan 15, 2019
```
Fix typo in GitHub integration docs

See merge request gitlab-org/gitlab-ee!9137
```
  b4203e70
- Automatic merge of gitlab-org/gitlab-ce master · 4027fc8f
  GitLab Bot authored Jan 15, 2019
  
  4027fc8f
- Merge branch 'docs/guidance-for-four-backticks' into 'master' · cbad001c
  Achilleas Pipinellis authored Jan 15, 2019
```
Document four backticks feature in markdown

See merge request gitlab-org/gitlab-ce!24349
```
  cbad001c
- Document four backticks feature in markdown · ca74ba97
  Evan Read authored Jan 15, 2019
  
  ca74ba97
- Automatic merge of gitlab-org/gitlab-ce master · d6815222
  GitLab Bot authored Jan 15, 2019
  
  d6815222
- Merge branch 'sh-fix-project-mirrors-mix-http-ssh-creds-ce' into 'master' · 09d9b115
  Nick Thomas authored Jan 15, 2019
```
Add clear_credentials method to ProjectImportData

See merge request gitlab-org/gitlab-ce!24373
```
  09d9b115
- Merge branch 'sh-fix-project-mirrors-mix-http-ssh-creds' into 'master' · 9fe0095e
  Nick Thomas authored Jan 15, 2019
```
Clear our import data credentials when adding new mirrors

Closes gitlab-ce#55729

See merge request gitlab-org/gitlab-ee!9134
```
  9fe0095e
- Clear our import data credentials when adding new mirrors · 36ed6748
  Stan Hu authored Jan 15, 2019
  
  36ed6748
- Merge branch 'tz-improve-navigation-initialisation' into 'master' · 55a1c6b5
  Phil Hughes authored Jan 15, 2019
```
Optimization of setup of Main Nav Layout, Contextual Sidebar and Fly Out Nav

Closes #56257

See merge request gitlab-org/gitlab-ce!24362
```
  55a1c6b5
- Optimization of setup of Main Nav Layout, Contextual Sidebar and Fly Out Nav · 8871dc90
  Tim Zallmann authored Jan 15, 2019
  
  8871dc90
- Merge branch 'fl-fix-label-feature-flags' into 'master' · 7f658331
  Kushal Pandya authored Jan 15, 2019
```
Fixes bad wording in FF loading state

Closes #9190

See merge request gitlab-org/gitlab-ee!9153
```
  7f658331
- Automatic merge of gitlab-org/gitlab-ce master · 025d1de3
  GitLab Bot authored Jan 15, 2019
  
  025d1de3
- Merge branch 'backstage/gb/refactor-only-except-policies-config' into 'master' · 8b4b7cae
  Kamil Trzciński authored Jan 15, 2019
```
Refactor only/except configuration policies

See merge request gitlab-org/gitlab-ce!24359
```
  8b4b7cae
- Merge branch '1979-2-0' into 'master' · 17adce45
  Sean McGivern authored Jan 15, 2019
```
Add ApprovalState

See merge request gitlab-org/gitlab-ee!8974
```
  17adce45
- Fixes bad wording in FF loading state · 64f30ea0
  Filipa Lacerda authored Jan 14, 2019
  
  64f30ea0
- Automatic merge of gitlab-org/gitlab-ce master · 1899e9a2
  GitLab Bot authored Jan 15, 2019
  
  1899e9a2
- Merge branch 'sh-fix-issue-55161' into 'master' · 11d6c7e2
  Rémy Coutable authored Jan 15, 2019
```
Fix failing MySQL spec due to deadlock condition

Closes #55161

See merge request gitlab-org/gitlab-ce!24378
```
  11d6c7e2
- Simplify code related to setting default config values · 3c5846cd
  Grzegorz Bizon authored Jan 15, 2019
  
  3c5846cd
- Automatic merge of gitlab-org/gitlab-ce master · 342bcc72
  GitLab Bot authored Jan 15, 2019
  
  342bcc72
- Merge branch 'fix-part-of-55966' into 'master' · 6357ff11
  Lin Jen-Shin authored Jan 15, 2019
```
Ignore Repository::AmbiguousRefError in db/fixtures/development

See merge request gitlab-org/gitlab-ce!24366
```
  6357ff11
- Make default config entry value configurable · 7b712d35
  Grzegorz Bizon authored Jan 14, 2019
```
Introduce `default:` configuration entry setting that makes it possible
to configure a default value of an entry, what overrides class-level
`def self.default` value.
```
  7b712d35
- Merge branch 'add-creation-update-ajax-endpoint-for-feature-flag' into 'master' · e2761f05
  Kamil Trzciński authored Jan 15, 2019
```
Support Ajax endpoints for FeatureFlagsController

See merge request gitlab-org/gitlab-ee!9127
```
  e2761f05
- Merge branch '5708-add-contact-sales-option-via-banner-for-canary-deployments' into 'master' · 1c1f904b
  Filipa Lacerda authored Jan 15, 2019
```
Backporting a change in ee branch

See merge request gitlab-org/gitlab-ce!23559
```
  1c1f904b
- Automatic merge of gitlab-org/gitlab-ce master · b45af1c3
  GitLab Bot authored Jan 15, 2019
  
  b45af1c3
- Merge branch '52278-squash-checkbox-fix' into 'master' · 713cf033
  Phil Hughes authored Jan 15, 2019
```
Resolve "When merging an MR, the squash checkbox isn't always supported"

Closes #52278

See merge request gitlab-org/gitlab-ce!24296
```
  713cf033
- Resolve "When merging an MR, the squash checkbox isn't always supported" · bce50453
  Natalia Tepluhina authored Jan 15, 2019
  
  bce50453
- Automatic merge of gitlab-org/gitlab-ce master · b169595f
  GitLab Bot authored Jan 15, 2019
  
  b169595f