Commits · v12.2.5-ee · GitLab.org / GitLab

10 Sep, 2019 8 commits
- Update VERSION to 12.2.5-ee · e817f2e2
  GitLab Release Tools Bot authored Sep 10, 2019
  
  e817f2e2
- Update CHANGELOG.md for 12.2.5 · dc86ecad
  GitLab Release Tools Bot authored Sep 10, 2019
```
[ci skip]
```
  dc86ecad
- Update CHANGELOG-EE.md for 12.2.5-ee · 081a044f
  GitLab Release Tools Bot authored Sep 10, 2019
```
[ci skip]
```
  081a044f
- Merge branch '12-2-stable' of dev.gitlab.org:gitlab/gitlabhq into 12-2-stable-ee · 5f70ea08
  John Jarvis authored Sep 10, 2019
  
  5f70ea08
- Merge branch 'security-12-2-bump-pages' into '12-2-stable-ee' · f4db2cab
  GitLab Release Tools Bot authored Sep 10, 2019
```
Set max-age and secure flag for pages auth cookies

See merge request gitlab/gitlab-ee!1232
```
  f4db2cab
- Merge branch 'security-project-from-template-vuln-12-2' into '12-2-stable-ee' · a4f8f4be
  GitLab Release Tools Bot authored Sep 10, 2019
```
Do not create projects from group template if project is not descendant of that group

See merge request gitlab/gitlab-ee!1269
```
  a4f8f4be
- Merge branch 'security-12-2-bump-pages' into '12-2-stable' · 69a1af2a
  GitLab Release Tools Bot authored Sep 10, 2019
```
Set max-age and secure flag for pages auth cookies

See merge request gitlab/gitlabhq!3379
```
  69a1af2a
- Do not create projects from group template if project is not descendant of that group · e1105cbf
  George Koltsov authored Sep 06, 2019
  
  e1105cbf
09 Sep, 2019 2 commits
- Upgrade pages to 1.7.2 · 81ad1386
  Vladimir Shushlin authored Aug 26, 2019
  
  81ad1386
- Upgrade pages to 1.7.2 · 5c8088da
  Vladimir Shushlin authored Aug 26, 2019
  
  5c8088da
02 Sep, 2019 15 commits
- Update VERSION to 12.2.4-ee · e57d66ff
  GitLab Release Tools Bot authored Sep 02, 2019
  
  e57d66ff
- Update CHANGELOG.md for 12.2.4 · bd9f842c
  GitLab Release Tools Bot authored Sep 02, 2019
```
[ci skip]
```
  bd9f842c
- Update CHANGELOG-EE.md for 12.2.4-ee · e3a3be36
  GitLab Release Tools Bot authored Sep 02, 2019
```
[ci skip]
```
  e3a3be36
- Update VERSION to 12.2.4 · fcd10768
  GitLab Release Tools Bot authored Sep 02, 2019
  
  fcd10768
- Update CHANGELOG.md for 12.2.4 · eca69adc
  GitLab Release Tools Bot authored Sep 02, 2019
```
[ci skip]
```
  eca69adc
- Merge branch '12-2-stable-patch-4' into '12-2-stable' · cded55c0
  John Jarvis authored Sep 02, 2019
```
Prepare 12.2.4 release

See merge request gitlab-org/gitlab-ce!32455
```
  cded55c0
- Merge branch '12-2-stable-ee-patch-4' into '12-2-stable-ee' · 9a85f279
  John Jarvis authored Sep 02, 2019
```
Prepare 12.2.4-ee release

See merge request gitlab-org/gitlab-ee!15885
```
  9a85f279
- Merge branch '12-2-stable-patch-4' of gitlab.com:gitlab-org/gitlab-ce into 12-2-stable-ee-patch-4 · ff402664
  John Jarvis authored Sep 02, 2019
  
  ff402664
- Merge branch '66803-fix-uploads-relative-link-filter' into 'master' · 2e0a846e
  Grzegorz Bizon authored Sep 02, 2019 and John Jarvis committed Sep 02, 2019
```
Fix permissions check in `RelativeLinkFilter`

See merge request gitlab-org/gitlab-ce!32448
```
  2e0a846e
- Merge branch '12-2-stable-patch-4' of gitlab.com:gitlab-org/gitlab-ce; branch... · 9b582e96
  John Jarvis authored Sep 02, 2019
```
Merge branch '12-2-stable-patch-4' of gitlab.com:gitlab-org/gitlab-ce; branch '12-2-stable-ee-patch-4' of gitlab.com:gitlab-org/gitlab-ee into 12-2-stable-ee-patch-4
```
  9b582e96
- Merge branch 'ashmckenzie/12-2-stable-patch-4-add-stub-config' into '12-2-stable-patch-4' · c838459f
  John Jarvis authored Sep 02, 2019
```
Add StubConfiguration.stub_config method

See merge request gitlab-org/gitlab-ce!32530
```
  c838459f
- Add StubConfiguration.stub_config method · 4925687e
  Ash McKenzie authored Sep 02, 2019
  
  4925687e
- Regenerate gitlab.pot with bundle exec rake gettext:regenerate · c9f0eb97
  John Jarvis authored Sep 02, 2019
  
  c9f0eb97
- Merge branch '12-2-stable-patch-4' of gitlab.com:gitlab-org/gitlab-ce into 12-2-stable-ee-patch-4 · 4e9ee2a2
  John Jarvis authored Sep 02, 2019
  
  4e9ee2a2
- Merge branch 'sh-mermaid-8.2.6' into 'master' · 271de447
  Filipa Lacerda authored Sep 02, 2019 and John Jarvis committed Sep 02, 2019
```
Update Mermaid to v8.2.6

See merge request gitlab-org/gitlab-ce!32502
```
  271de447
30 Aug, 2019 12 commits

Automatic merge of gitlab-org/gitlab-ce 12-2-stable-patch-4 · d67ce3a7
🤖 GitLab Bot 🤖 authored Aug 30, 2019

d67ce3a7

Merge branch 'fix-migration-helper' into 'master' · a03d1f31

Stan Hu authored Aug 25, 2019 and

GitLab Release Tools Bot committed Aug 30, 2019

Add helper to exactly undo cleanup_concurrent_column_rename

See merge request gitlab-org/gitlab-ee!15614

(cherry picked from commit 1ae869e8)

37573ab0 Add helper to exactly undo cleanup_concurrent_column_rename
356b1532 Add spec for undo_rename_column_concurrently
52762300 Add spec for when default is false

a03d1f31

Merge branch 'sh-fix-group-hooks' into 'master' · c25c0169

Douglas Barbosa Alexandre authored Aug 26, 2019 and

GitLab Release Tools Bot committed Aug 30, 2019

Fix group hooks not firing in PostReceive

Closes #13752

See merge request gitlab-org/gitlab-ee!15598

(cherry picked from commit 428c5947)

d4cdff14 Fix group hooks not firing in PostReceive

c25c0169

Merge branch 'revert-' into 'master' · 9fb5230f

Evan Read authored Aug 30, 2019 and

GitLab Release Tools Bot committed Aug 30, 2019

Revert "Merge branch 'nik-api-snippets-fix' into 'master'"

Closes #66673

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

(cherry picked from commit 98f2ab29)

5e0378b3 Revert "Merge branch 'nik-api-snippets-fix' into 'master'"

9fb5230f

Merge branch 'sh-fix-snippet-visibility-api' into 'master' · 14b67e94

Rémy Coutable authored Aug 29, 2019 and

GitLab Release Tools Bot committed Aug 30, 2019

Fix snippets API not working with visibility level

Closes #66050

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

(cherry picked from commit 1843502f)

680f4377 Fix snippets API not working with visibility level

14b67e94

Merge branch 'sh-fix-piwik-template' into 'master' · 01f01313

Ash McKenzie authored Aug 27, 2019 and

GitLab Release Tools Bot committed Aug 30, 2019

Fix Piwik not working

Closes #66627

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

(cherry picked from commit 0c639b24)

f6058981 Fix Piwik not working

01f01313

Merge branch 'sh-upgrade-mermaid-8.2.4' into 'master' · bec06b7d
Filipa Lacerda authored Aug 28, 2019 and GitLab Release Tools Bot committed Aug 30, 2019
```
Upgrade Mermaid to v8.2.4

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

(cherry picked from commit f90759bb)

c2541b64 Upgrade Mermaid to v8.2.4
```
bec06b7d

Merge branch 'fix-migration-helper' into 'master' · bb58d4cd

Stan Hu authored Aug 25, 2019 and

GitLab Release Tools Bot committed Aug 30, 2019

Add helpers to exactly undo cleanup_concurrent_column_rename

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

(cherry picked from commit fc08d48c)

9b592a59 Add helper to exactly undo cleanup_concurrent_column_rename
61777843 Add spec for undo_rename_column_concurrently
d28ad870 Add spec for when default is false

bb58d4cd

Merge branch 'patch-74' into 'master' · da6fa19f

Mike Greiling authored Aug 26, 2019 and

GitLab Release Tools Bot committed Aug 30, 2019

fix: remove double %

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

(cherry picked from commit bf2b4c52)

22e2a601 fix: remove double % from layout width description

da6fa19f

Merge branch 'sh-fix-nplusone-issues' into 'master' · d074658a

Mayra Cabrera authored Aug 26, 2019 and

GitLab Release Tools Bot committed Aug 30, 2019

Fix N+1 Gitaly calls in /api/v4/projects/:id/issues

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

(cherry picked from commit bbd39021)

44063501 Fix N+1 Gitaly calls in /api/v4/projects/:id/issues

d074658a

Merge branch 'fe-fix-issuable-sidebar-icon-of-notification-disabled' into 'master' · 3efca731

Mike Greiling authored Aug 23, 2019 and

GitLab Release Tools Bot committed Aug 30, 2019

Fix issuable sidebar icon of notification disabled

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

(cherry picked from commit a93612aa)

9ad0a8ad Fix issuable sidebar icon of notification disabled

3efca731

Merge branch '66066-dark-theme-style-for-expansion-on-mr-diffs' into 'master' · 9ec18138

Mike Greiling authored Aug 20, 2019 and

GitLab Release Tools Bot committed Aug 30, 2019

Match syntax highlighting theme for line expansion rows

Closes #66066

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

(cherry picked from commit 1349a3d5)

9013ab1f Add syntax highlighting for line expansion

9ec18138

29 Aug, 2019 1 commit
- Merge remote-tracking branch 'ce/12-2-stable' into 12-2-stable-ee · 0d9261b2
  Robert Speicher authored Aug 29, 2019
```
[ci skip]
```
  0d9261b2
28 Aug, 2019 2 commits
- Update VERSION to 12.2.3-ee · 3a1dd80d
  GitLab Release Tools Bot authored Aug 28, 2019
  
  3a1dd80d
- Update CHANGELOG.md for 12.2.3 · 49a17283
  GitLab Release Tools Bot authored Aug 28, 2019
```
[ci skip]
```
  49a17283