Commits · 28ca155be9c9fe63aa97d7f7fb9048ccf7c1401b · nexedi / gitlab-ce

16 Jan, 2019 5 commits
- Merge branch 'zj-feature-gate-set-project-path' into 'master' · 28ca155b
  Kamil Trzciński authored Jan 16, 2019
```
Allow setting of feature gates per project

See merge request gitlab-org/gitlab-ce!24184
```
  28ca155b
- Merge branch 'update-sidekiq-cron' into 'master' · 372716ea
  Kamil Trzciński authored Jan 16, 2019
```
Update sidekiq-cron 0.6.0 -> 1.0

See merge request gitlab-org/gitlab-ce!24235
```
  372716ea
- Merge branch 'fix-403-page-is-rendered-but-404-is-the-response' into 'master' · 87f6f6f7
  Lin Jen-Shin authored Jan 16, 2019
```
Show the correct error page when access is denied

Closes #55110

See merge request gitlab-org/gitlab-ce!23932
```
  87f6f6f7
- Merge branch 'sh-fix-prettier-failures' into 'master' · a2b26577
  Kushal Pandya authored Jan 16, 2019
```
Run prettier on squash_before_merge.vue

See merge request gitlab-org/gitlab-ce!24413
```
  a2b26577
- Run prettier on squash_before_merge.vue · 5dd2f1fc
  Stan Hu authored Jan 15, 2019
  
  5dd2f1fc
15 Jan, 2019 35 commits
- Merge branch 'mg-upgrade-prettier-again' into 'master' · c18a214e
  Clement Ho authored Jan 15, 2019
```
Upgrade prettier to v1.15.3

See merge request gitlab-org/gitlab-ce!24312
```
  c18a214e
- Merge branch 'patch-37' into 'master' · d9e4e3f7
  Fatih Acet authored Jan 15, 2019
```
Externalize strings from `/app/views/profiles/accounts`

See merge request gitlab-org/gitlab-ce!24095
```
  d9e4e3f7
- Externalize strings from `/app/views/profiles/accounts` · 67e3a724
  André Gama authored Jan 15, 2019
  
  67e3a724
- Show the correct error page when access is denied · 3bd306dd
  Luke Bennett authored Dec 19, 2018
  
  3bd306dd
- Merge branch 'allow-to-quarantine-tests' into 'master' · 75b1837d
  Robert Speicher authored Jan 15, 2019
```
Allow to quarantine tests

See merge request gitlab-org/gitlab-ce!24369
```
  75b1837d
- Merge branch '55111-gitlab-api-does-not-manage-default_branch_protection-3-value' into 'master' · 3499da77
  Nick Thomas authored Jan 15, 2019
```
API: Fix default branch protection setting for Admin API

Closes #55111

See merge request gitlab-org/gitlab-ce!24398
```
  3499da77
- API: Fix default branch protection setting for Admin API · 7be19280
  Robert Schilling authored Jan 15, 2019
  
  7be19280
- Merge branch 'docs/uplift-branches-api-doc' into 'master' · f06a9035
  Achilleas Pipinellis authored Jan 15, 2019
```
Add more information and refactor format of branch-related API topics

See merge request gitlab-org/gitlab-ce!24290
```
  f06a9035
- Add more information and refactor format of branch-related API topics · 3d37cf79
  Evan Read authored Jan 15, 2019
  
  3d37cf79
- Merge branch 'docs/uplift-avatar-api-doc' into 'master' · 97a0bfd6
  Achilleas Pipinellis authored Jan 15, 2019
```
Add more information and refactor format of Avatar API topic

See merge request gitlab-org/gitlab-ce!24258
```
  97a0bfd6
- Add more information and refactor format of Avatar API topic · 6dd8dbb4
  Evan Read authored Jan 15, 2019
  
  6dd8dbb4
- Merge branch 'homepage-proj-descr-cutoff' into 'master' · 84147b2b
  Annabel Dunstone Gray authored Jan 15, 2019
```
Increase line height of project summaries

See merge request gitlab-org/gitlab-ce!24341
```
  84147b2b
- 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
- Adopt Fugit to replace Rufus::Scheduler · def2d556
  Lin Jen-Shin authored Jan 08, 2019
  
  def2d556
- Update sidekiq-cron 0.6.0 -> 1.0 · dbecca8e
  Pirate Praveen authored Dec 20, 2018
  
  dbecca8e
- 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-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
- Add jobs to run quarantine tests · d71eb8fc
  Rémy Coutable authored Jan 14, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d71eb8fc
- Quarantine very flaky tests · b876d5c8
  Rémy Coutable authored Jan 14, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b876d5c8
- Allow to quarantine tests · 642bd8ce
  Rémy Coutable authored Jan 14, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  642bd8ce
- 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 '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
- 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 '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 '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 '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
- 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 '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