Commits · bc33774f5227c2a8ca7dbc04c5a6a88bd5abdbc9 · nexedi / gitlab-ce

22 Sep, 2017 1 commit

Merge branch 'acet-switch-markdown-pane' into 'master' · bc33774f

Jacob Schatz authored Sep 22, 2017

IssueNotes: Switch back to Write pane when note cancel or submit.

Closes #37907

See merge request gitlab-org/gitlab-ce!14402

bc33774f

21 Sep, 2017 32 commits
- IssueNotes: Switch back to Write pane when note cancel or submit. · 66da536a
  Fatih Acet authored Sep 21, 2017
  
  66da536a
- Merge branch 'winh-upgrade-nokogiri' into 'master' · 92173ac5
  Robert Speicher authored Sep 21, 2017
```
Upgrade Nokogiri because of CVE-2017-9050

See merge request gitlab-org/gitlab-ce!14427
```
  92173ac5
- Merge branch 'acet-fix-comment-form-resize' into 'master' · 137c5822
  Jacob Schatz authored Sep 21, 2017
```
IssueNotes: Resize comment form after note submit and discard.

Closes #38115

See merge request gitlab-org/gitlab-ce!14401
```
  137c5822
- Merge branch 'tc-bump-version-10.1-pre' into 'master' · cfc2294f
  Robert Speicher authored Sep 21, 2017
```
Bump VERSION to 10.1.0-pre

[ci skip]

See merge request gitlab-org/gitlab-ce!14426
```
  cfc2294f
- Upgrade Nokogiri because of CVE-2017-9050 · f45f7ad6
  Winnie Hellmann authored Sep 21, 2017
  
  f45f7ad6
- Bump VERSION to 10.1.0-pre · ea569a45
  Toon Claes authored Sep 21, 2017
  
  ea569a45
- Merge branch 'cache-csrf-token' into 'master' · 905d24fb
  Phil Hughes authored Sep 21, 2017
```
Standardize access to CSRF token in JavaScript

Closes #37773

See merge request gitlab-org/gitlab-ce!14241
```
  905d24fb
- Standardize access to CSRF token in JavaScript · cca06da2
  Bryce Johnson authored Sep 21, 2017
  
  cca06da2
- Merge branch 'hide-frontmatter-help-page' into 'master' · 6c0473ef
  Robert Speicher authored Sep 21, 2017
```
Do not show YAML frontmatter for doc pages under /help

See merge request gitlab-org/gitlab-ce!14345
```
  6c0473ef
- Merge branch 'force-two-up-view' into 'master' · 3ce36140
  Filipa Lacerda authored Sep 21, 2017
```
Force two up view

Closes #32613

See merge request gitlab-org/gitlab-ce!14397
```
  3ce36140
- Merge branch 'bvl-transient-failure-health-controller-spec' into 'master' · b3544dfe
  Douwe Maan authored Sep 21, 2017
```
Don't memoize storage configuration on `FsShardsCheck`

Closes #38140

See merge request gitlab-org/gitlab-ce!14419
```
  b3544dfe
- Merge branch 'dm-closing-issue-urls' into 'master' · 6c026c36
  Robert Speicher authored Sep 21, 2017
```
Correctly detect multiple issue URLs after 'Closes...' in MR descriptions

Closes #33745

See merge request gitlab-org/gitlab-ce!14411
```
  6c026c36
- Don't memoize storage configuration on `FsShardsCheck` · eb63889f
  Bob Van Landuyt authored Sep 21, 2017
```
These values are already coming from memory, so we don't need to
memoize.

If we do memoize these, than the would not be stubbed when calling
`stub_storage_settings` in specs
```
  eb63889f
- Merge branch '32894-update-ux-icon-documentation' into 'master' · 35665880
  Marcia Ramos authored Sep 21, 2017
```
Resolve "[Meta] Create Uniquely 'GitLab' Icons"

Closes #32894

See merge request gitlab-org/gitlab-ce!14396
```
  35665880
- Merge branch 'docs/owners-can-create-subgroups' into 'master' · 42453069
  Marcia Ramos authored Sep 21, 2017
```
Document that group Owners can always create subgroups

See merge request gitlab-org/gitlab-ce!14416
```
  42453069
- Merge branch '32796-add-ee-tag-detection-to-remove-old-in-gitlab-backup' into 'master' · 8a20e8b8
  Rémy Coutable authored Sep 21, 2017
```
Adds EE tag detection to remove_old in gitlab backup.

Closes #32796

See merge request gitlab-org/gitlab-ce!14413
```
  8a20e8b8
- Document that group Owners can always create subgroups · 085c4cb7
  Achilleas Pipinellis authored Sep 21, 2017
```
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/30473
MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14046
```
  085c4cb7
- Merge branch 'docs/autodevops-cleanup' into 'master' · f918e005
  Achilleas Pipinellis authored Sep 21, 2017
```
Auto DevOps docs cleanup

Closes #37666, #37592, #37468, and #31641

See merge request gitlab-org/gitlab-ce!14293
```
  f918e005
- Auto DevOps docs cleanup · e63d78f9
  Achilleas Pipinellis authored Sep 21, 2017
  
  e63d78f9
- Adds EE tag detection to remove_old in gitlab backup. · 4c5acdda
  Tiago Botelho authored Sep 21, 2017
  
  4c5acdda
- Correctly detect multiple issue URLs after 'Closes...' in MR descriptions · a3d5c82f
  Douwe Maan authored Sep 21, 2017
  
  a3d5c82f
- Merge branch 'docs-updates-sharing-permissions-and-project-filter' into 'master' · cfccb278
  Achilleas Pipinellis authored Sep 21, 2017
```
new sharing permissions screenshot

See merge request gitlab-org/gitlab-ce!14408
```
  cfccb278
- new sharing permissions · b3178f56
  Mike Bartlett authored Sep 21, 2017
  
  b3178f56
- Merge branch '37220-es-modules' into 'master' · 598b1a17
  Phil Hughes authored Sep 21, 2017
```
Use modules in common utils

See merge request gitlab-org/gitlab-ce!14074
```
  598b1a17
- Merge branch 'feature/plantuml-restructured-text' into 'master' · ac044ba0
  Douwe Maan authored Sep 21, 2017
```
Upgrade gitlab-markup gem

See merge request gitlab-org/gitlab-ce!14395
```
  ac044ba0
- Merge branch '38088-remove-banner-to-customize-experience' into 'master' · 39b90bce
  Douwe Maan authored Sep 21, 2017
```
Resolve "Remove banner to customize experience"

Closes #38088

See merge request gitlab-org/gitlab-ce!14384
```
  39b90bce
- Merge branch 'events-redundant-where' into 'master' · 87f179e0
  Rémy Coutable authored Sep 21, 2017
```
Remove redundant WHERE from event queries

Closes #38129

See merge request gitlab-org/gitlab-ce!14389
```
  87f179e0
- Merge branch 'remove-use-key-worker' into 'master' · d863326e
  Rémy Coutable authored Sep 21, 2017
```
Stop using Sidekiq for updating Key#last_used_at

Closes #36663

See merge request gitlab-org/gitlab-ce!14391
```
  d863326e
- Merge branch 'resolve-discussions-btn' into 'master' · 6374530d
  Phil Hughes authored Sep 21, 2017
```
Make resolve discussion icon gray

See merge request gitlab-org/gitlab-ce!14398
```
  6374530d
- Merge branch '10-0-sync-master' into 'master' · 251ed2d4
  Simon Knox authored Sep 21, 2017
```
Sync dev to gitlab.com

See merge request gitlab-org/gitlab-ce!14406
```
  251ed2d4
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · e20d47aa
  Jarka Kadlecova authored Sep 21, 2017
  
  e20d47aa
- IssueNotes: Resize comment form after note submit and discard. · d9a3bbce
  Fatih Acet authored Sep 21, 2017
  
  d9a3bbce
20 Sep, 2017 7 commits
- Merge branch 'fix-image-diff-swipe-handle' into 'master' · 47f172bc
  Annabel Dunstone Gray authored Sep 20, 2017
```
Fix image diff swipe handle offset to correctly align with the frame

Closes #37928

See merge request gitlab-org/gitlab-ce!14392
```
  47f172bc
- [skip ci] Add changelog · 71bc619e
  Clement Ho authored Sep 20, 2017
  
  71bc619e
- Make resolve discussion icon gray · 22d930ae
  Annabel Dunstone Gray authored Sep 20, 2017
  
  22d930ae
- Merge branch '38049-fix-resolve-in-new-issue-btn' into 'master' · d3ee059d
  Annabel Dunstone Gray authored Sep 20, 2017
```
Fix the "resolve discussion in a new issue" button

Closes #38049

See merge request gitlab-org/gitlab-ce!14357
```
  d3ee059d
- update spacing · 0058c315
  sarrahvesselov authored Sep 20, 2017
  
  0058c315
- Deleted another Fixture due to User Callout · eebd99b2
  Tim Zallmann authored Sep 20, 2017
  
  eebd99b2
- Fixture Creation removed · 2e08a13f
  Tim Zallmann authored Sep 20, 2017
  
  2e08a13f