Commits · e2599356f8d688f5125b5f712bbb77d2cf313c15 · nexedi / gitlab-ce

16 Jan, 2019 7 commits
- Automatic merge of gitlab-org/gitlab-ce master · e2599356
  GitLab Bot authored Jan 16, 2019
  
  e2599356
- 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
- Automatic merge of gitlab-org/gitlab-ce master · f7265d5f
  GitLab Bot authored Jan 16, 2019
  
  f7265d5f
- 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
- Merge branch 'sh-fix-locale-pot-2018-11-15' into 'master' · 6395c5e4
  Stan Hu authored Jan 16, 2019
```
Fix broken master due locale/gitlab.pot

See merge request gitlab-org/gitlab-ee!9179
```
  6395c5e4
- Run prettier on ready_to_merge.vue and squash_before_merge.vue · 14e5acce
  Stan Hu authored Jan 16, 2019
  
  14e5acce
15 Jan, 2019 33 commits
- Fix broken master due locale/gitlab.pot · 5a8a4d73
  Stan Hu authored Jan 15, 2019
  
  5a8a4d73
- Merge branch 'docs-clarify-jira-dev-panel' into 'master' · 401441ea
  Evan Read authored Jan 15, 2019
```
Docs - Update jira dev panel doc

Closes #8943

See merge request gitlab-org/gitlab-ee!8941
```
  401441ea
- Docs - Update jira dev panel doc · 39a43836
  Cody West authored Jan 15, 2019
  
  39a43836
- Automatic merge of gitlab-org/gitlab-ce master · b74357b7
  GitLab Bot authored Jan 15, 2019
  
  b74357b7
- 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 'mg-upgrade-prettier-again-ee' into 'master' · 7429b0f1
  Clement Ho authored Jan 15, 2019
```
Upgrade prettier to v1.15.3

See merge request gitlab-org/gitlab-ee!9126
```
  7429b0f1
- Automatic merge of gitlab-org/gitlab-ce master · 34ebb3ec
  GitLab Bot authored Jan 15, 2019
  
  34ebb3ec
- 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
- Merge branch 'ee-patch-37' into 'master' · aa5bdb99
  Fatih Acet authored Jan 15, 2019
```
Externalize strings from `/app/views/profiles/accounts`

See merge request gitlab-org/gitlab-ee!9099
```
  aa5bdb99
- Externalize strings from `/app/views/profiles/accounts` · 6e516eb0
  George Tsiolis authored Jan 15, 2019
  
  6e516eb0
- Show the correct error page when access is denied · 3bd306dd
  Luke Bennett authored Dec 19, 2018
  
  3bd306dd
- Automatic merge of gitlab-org/gitlab-ce master · 0894114b
  GitLab Bot authored Jan 15, 2019
  
  0894114b
- 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 'ee-allow-to-quarantine-tests' into 'master' · 8fc0c9db
  Robert Speicher authored Jan 15, 2019
```
[EE] Allow to quarantine tests

See merge request gitlab-org/gitlab-ee!9167
```
  8fc0c9db
- Automatic merge of gitlab-org/gitlab-ce master · 5cabd7f6
  GitLab Bot authored Jan 15, 2019
  
  5cabd7f6
- 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
- Automatic merge of gitlab-org/gitlab-ce master · 8441dc76
  GitLab Bot authored Jan 15, 2019
  
  8441dc76
- 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
- Automatic merge of gitlab-org/gitlab-ce master · aa19c0d7
  GitLab Bot authored Jan 15, 2019
  
  aa19c0d7
- 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 'sh-migrate-invalid-auth-modes' into 'master' · d166222f
  Nick Thomas authored Jan 15, 2019
```
Fix mirrors that have invalid SSH public auth mode set

See merge request gitlab-org/gitlab-ee!9135
```
  d166222f
- 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
- Fix mirrors that have invalid SSH public auth mode set · ff8b3ef3
  Stan Hu authored Jan 15, 2019
```
From https://gitlab.com/gitlab-org/gitlab-ce/issues/55729, there are
more than 129 pull mirrors that have an invalid auth set because
the user may have had previously configured the mirror with SSH
credentials. This post-deploy migration switches any pull
mirrors to password mode that fall under the criteria:

1. They are using SSH public key auth
2. They have an import_url that starts with `http`
```
  ff8b3ef3
- 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