Commits · 3f0e6d92055e7e1923a51684a397a2a150475899 · nexedi / gitlab-ce

27 Jul, 2018 2 commits
- More Gitaly cleanup: fetch_ref, allow disk access blocks · 3f0e6d92
  Jacob Vosmaer (GitLab) authored Jul 27, 2018
  
  3f0e6d92
- Merge branch 'rails5-update-gemfile-lock-2' into 'master' · 835bacc2
  Rémy Coutable authored Jul 27, 2018
```
Rails5 update Gemfile.rails5.lock

See merge request gitlab-org/gitlab-ce!20858
```
  835bacc2
26 Jul, 2018 38 commits
- Merge remote-tracking branch 'dev/master' · 13ea4b38
  Felipe Artur authored Jul 26, 2018
  
  13ea4b38
- Merge branch '48617-promoting-milestone' into 'master' · 45c94aba
  Felipe Artur Cardozo authored Jul 26, 2018
```
[master] Escapes milestone title shown in flash message when promoting a milestone

See merge request gitlab/gitlabhq!2436
```
  45c94aba
- Merge branch 'security-ide-branch-name-xss' into 'master' · 9852304b
  Felipe Artur Cardozo authored Jul 26, 2018
```
[master] Fixed XSS in branch name in Web IDE

See merge request gitlab/gitlabhq!2431
```
  9852304b
- Merge branch 'security-2690-fix-tooltip' into 'master' · dae85363
  Felipe Artur Cardozo authored Jul 26, 2018
```
[master] Escapes job name used in tooltips

See merge request gitlab/gitlabhq!2427
```
  dae85363
- Merge branch 'security-fj-missing-csrf-system-hooks' into 'master' · bc1b4d9f
  Felipe Artur Cardozo authored Jul 26, 2018
```
[master] Missing CSRF in System Hooks

See merge request gitlab/gitlabhq!2419
```
  bc1b4d9f
- Merge branch 'mk/fix-callback-canceling-in-namespace-move-dir' into 'master' · caeb4597
  Stan Hu authored Jul 26, 2018
```
Fix namespace move callback behavior, especially to fix Geo replication of namespace moves during certain exceptions

Closes gitlab-ee#6252

See merge request gitlab-org/gitlab-ce!19297
```
  caeb4597
- Fix namespace move callback behavior, especially to fix Geo replication of... · 9e396d6e
  Michael Kozono authored Jul 26, 2018
```
Fix namespace move callback behavior, especially to fix Geo replication of namespace moves during certain exceptions
```
  9e396d6e
- Merge branch '48542-code-link' into 'master' · 20e63ba1
  Clement Ho authored Jul 26, 2018
```
Resolve "BS4: Link in code brackets has two different styles"

Closes #48542

See merge request gitlab-org/gitlab-ce!20841
```
  20e63ba1
- Resolve "BS4: Link in code brackets has two different styles" · 42e16e04
  Annabel Gray authored Jul 26, 2018
  
  42e16e04
- Merge branch 'full-list-of-vulnerabilities-5239' into 'master' · 8e675082
  Phil Hughes authored Jul 26, 2018
```
Full list of vulnerabilities

See merge request gitlab-org/gitlab-ce!20855
```
  8e675082
- Full list of vulnerabilities · da20731f
  Sam Beckham authored Jul 26, 2018
  
  da20731f
- Merge branch 'remove-unnecessary-css' into 'master' · ef455b5d
  Clement Ho authored Jul 26, 2018
```
Remove CSS

See merge request gitlab-org/gitlab-ce!20845
```
  ef455b5d
- Merge branch 'update-danger-image' into 'master' · f055b87e
  Robert Speicher authored Jul 26, 2018
```
Update the image for the 'danger-review' job

See merge request gitlab-org/gitlab-ce!20856
```
  f055b87e
- Merge branch '48055-web-ide-resize-handles' into 'master' · 9ea2e664
  Phil Hughes authored Jul 26, 2018
```
Resolve "Resize handles for Web IDE right sidebar are too thin"

Closes #48055

See merge request gitlab-org/gitlab-ce!20818
```
  9ea2e664
- Rails5 update Gemfile.rails5.lock · 43914593
  Jasper Maes authored Jul 26, 2018
  
  43914593
- Merge branch '48636-new-mr-card-styles' into 'master' · 4cebdbbe
  Clement Ho authored Jul 26, 2018
```
Resolve "BS4: Create new Merge request boxes have different styles"

Closes #48636

See merge request gitlab-org/gitlab-ce!20822
```
  4cebdbbe
- Resolve "BS4: Create new Merge request boxes have different styles" · bf73bb30
  Annabel Gray authored Jul 26, 2018
  
  bf73bb30
- Merge branch '49107-prefetching-of-assets-and-cdn-domain' into 'master' · 1f70de18
  Clement Ho authored Jul 26, 2018
```
DNS Prefetching + Preconnect of assets_host (CDN Domain)

Closes #49107

See merge request gitlab-org/gitlab-ce!20781
```
  1f70de18
- DNS Prefetching + Preconnect of assets_host (CDN Domain) · f7ac5384
  Tim Zallmann authored Jul 26, 2018
  
  f7ac5384
- Merge branch 'ide-delete-entries' into 'master' · 2fbafe1a
  Tim Zallmann authored Jul 26, 2018
```
Enable deleting files in the Web IDE

See merge request gitlab-org/gitlab-ce!20595
```
  2fbafe1a
- Enable deleting files in the Web IDE · cded268c
  Phil Hughes authored Jul 26, 2018
  
  cded268c
- Update the image for the 'danger-review' job · c13dfc4d
  Rémy Coutable authored Jul 26, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c13dfc4d
- Merge branch '49614-dynamic-component-in-report-issue' into 'master' · 88738408
  Phil Hughes authored Jul 26, 2018
```
Make report_issues.vue easily extendable

Closes #49614

See merge request gitlab-org/gitlab-ce!20843
```
  88738408
- Make report_issues.vue easily extendable · 58cff01d
  Lukas Eipert authored Jul 26, 2018
  
  58cff01d
- Merge branch 'wrap-job-name-on-jobs-sidebar' into 'master' · c364c37c
  Tim Zallmann authored Jul 26, 2018
```
Wrap job name on pipeline job sidebar

Closes #49540

See merge request gitlab-org/gitlab-ce!20804
```
  c364c37c
- Merge branch 'winh-fail-slow-karma-tests' into 'master' · dc31edfb
  Tim Zallmann authored Jul 26, 2018
```
Fail Karma tests that take longer than a second

Closes #44174

See merge request gitlab-org/gitlab-ce!20518
```
  dc31edfb
- Merge branch 'sh-bump-haml-5.0.4' into 'master' · c495f8c1
  Rémy Coutable authored Jul 26, 2018
```
Bump haml gem to 5.0.4

See merge request gitlab-org/gitlab-ce!20847
```
  c495f8c1
- Merge branch '49631-fix-dangerfile-schema-rb' into 'master' · 674882fe
  Rémy Coutable authored Jul 26, 2018
```
Resolve "Dangerfile reporting that db/schema.rb wasn't updated"

Closes #49631

See merge request gitlab-org/gitlab-ce!20852
```
  674882fe
- Merge branch 'ce-5158-metrics-alerting' into 'master' · 33aa3ca8
  Sean McGivern authored Jul 26, 2018
```
Backport 5158-metrics-alerting to CE

See merge request gitlab-org/gitlab-ce!20148
```
  33aa3ca8
- Merge branch 'ide-edit-json-files' into 'master' · ffbfd18c
  Tim Zallmann authored Jul 26, 2018
```
Fixed IDE not opening JSON files

See merge request gitlab-org/gitlab-ce!20798
```
  ffbfd18c
- Fixed IDE not opening JSON files · 832dcd6c
  Phil Hughes authored Jul 26, 2018
  
  832dcd6c
- Merge branch 'tz-move-repo-css' into 'master' · 4fd6b5bc
  Phil Hughes authored Jul 26, 2018
```
Moved repo.css to its own CSS bundle to reduce the size of the main bundle

See merge request gitlab-org/gitlab-ce!20853
```
  4fd6b5bc
- Moved repo.css to its own CSS bundle to reduce the size of the main bundle · 4d3c6f46
  Tim Zallmann authored Jul 26, 2018
  
  4d3c6f46
- Merge branch 'gitlab-qa-reset-local-store' into 'master' · 117567fa
  Rémy Coutable authored Jul 26, 2018
```
Reset local storage between qa tests

Closes gitlab-qa#303

See merge request gitlab-org/gitlab-ce!20844
```
  117567fa
- Merge branch '31576-redirect-commits-to-root-if-no-ref' into 'master' · 13b97d3f
  Douwe Maan authored Jul 26, 2018
```
Resolve "Define /commits/ behaviour"

Closes #31576

See merge request gitlab-org/gitlab-ce!20738
```
  13b97d3f
- Merge branch 'bvl-graphql-wip-mutation' into 'master' · 64661425
  Douwe Maan authored Jul 26, 2018
```
toggle wip status using GraphQL mutation

Closes #48719

See merge request gitlab-org/gitlab-ce!20443
```
  64661425
- Merge branch 'rs-danger-frozen_string' into 'master' · 447ccbe4
  Rémy Coutable authored Jul 26, 2018
```
Make the frozen_string Danger check more resilient

See merge request gitlab-org/gitlab-ce!20849
```
  447ccbe4
- Merge branch 'issue-boards-js-fix-backport' into 'master' · 62f383a1
  Tim Zallmann authored Jul 26, 2018
```
CE backport of issue-boards-js-fix

See merge request gitlab-org/gitlab-ce!20840
```
  62f383a1