Commits · 564aa0515d84a66b312b0b68a301845118915fa7 · nexedi / gitlab-ce

26 May, 2017 19 commits
- Update spec to match latest EE changes · 564aa051
  Stan Hu authored May 26, 2017
  
  564aa051
- Add missing project import job example from gitlab-ee · e76a30c7
  Alejandro Rodríguez authored Oct 25, 2016
  
  e76a30c7
- Merge branch 'fix-counter-cache-for-acts-as-taggable' into 'master' · bd259d6b
  Stan Hu authored May 26, 2017
```
Fix Counter Cache not being disabled for acts-on-taggable

Closes #30582

See merge request !11727
```
  bd259d6b
- Merge branch '31448-jira-urls' into 'master' · 2eb3a405
  Grzegorz Bizon authored May 26, 2017
```
Add API URL to JIRA settings

Closes #31448

See merge request !11707
```
  2eb3a405
- Merge branch 'diffcollection-no-restarts' into 'master' · 324af4ac
  Douwe Maan authored May 26, 2017
```
Fix buffering in DiffCollection

See merge request !11659
```
  324af4ac
- Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into 'master' · a59165e7
  Clement Ho authored May 26, 2017
```
Fix error thrown with missing note fragment in DOM

Closes #32888

See merge request !11700
```
  a59165e7
- Merge branch 'fix-emoji-menu-z-index' into 'master' · ce6d850e
  Annabel Dunstone Gray authored May 26, 2017
```
Set emoji-menu z-index to 200

Closes #32632

See merge request !11686
```
  ce6d850e
- Set emoji-menu z-index to 200 · 3fa739af
  Luke "Jared" Bennett authored May 26, 2017
  
  3fa739af
- Merge branch '32683-resolved-discussions-icon-is-misaligned' into 'master' · 827fd034
  Annabel Dunstone Gray authored May 26, 2017
```
Resolve "Resolved discussions icon is misaligned"

Closes #32683

See merge request !11711
```
  827fd034
- Resolve "Resolved discussions icon is misaligned" · 688bf7a6
  Luke "Jared" Bennett authored May 26, 2017
  
  688bf7a6
- Merge branch '32851-postgres-min-version' into 'master' · d5b2c5e3
  Douwe Maan authored May 26, 2017
```
Drop support for postgresql 9.1 in GitLab 9.3

Closes #32851

See merge request !11677
```
  d5b2c5e3
- Merge branch 'locale-region-fix' into 'master' · bdc91dfb
  Douwe Maan authored May 26, 2017
```
Fixed locale frontend not picking up regions

Closes #32913

See merge request !11717
```
  bdc91dfb
- Add API URL to JIRA settings · 6c17e4f0
  Jarka Kadlecova authored May 23, 2017
  
  6c17e4f0
- Minimum postgresql version is now 9.2 · e961f3da
  Nick Thomas authored May 24, 2017
  
  e961f3da
- Merge branch 'zj-docs-on-pipeline-schedules' into 'master' · 8f2af757
  Achilleas Pipinellis authored May 26, 2017
```
Remove trigger docs job

See merge request !11574
```
  8f2af757
- Merge branch '31556-ci-coverage-paralel-rspec' into 'master' · 7a509c26
  Kamil Trzciński authored May 26, 2017
```
Return the last coverage in trace stream

Closes #31556

See merge request !11128
```
  7a509c26
- Merge branch '32737-audit-long-term-cacheability-of-webpack-assets' into 'master' · ce6bc061
  Tim Zallmann authored May 26, 2017
```
Resolve "Audit long-term cacheability of webpack assets"

Closes #32737

See merge request !11622
```
  ce6bc061
- Fix Counter Cache not being disabled for acts-on-taggable · 9d40646a
  Kamil Trzcinski authored May 26, 2017
  
  9d40646a
- Fix error thrown with missing note fragment in DOM · 07a3a69c
  Eric Eastwood authored May 24, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32888

Reproduction:

 1. Visit /namespace/project/merge_requests/x/diffs#note_1234
 1. When `#note_1234` isn't in the diff, an error is thrown
```
  07a3a69c
25 May, 2017 21 commits
- Merge branch 'dm-diff-cleanup' into 'master' · 8e2fefc6
  Robert Speicher authored May 25, 2017
```
Clean up diff rendering

See merge request !11390
```
  8e2fefc6
- Address feedback · d88a5c1d
  Douwe Maan authored May 25, 2017
  
  d88a5c1d
- Merge branch '32851-fix-postgres-9-1' into 'master' · e20eb712
  Douwe Maan authored May 25, 2017
```
Resolve "GitLab 9.0 to 9.2 is incompatible with PostgreSQL 9.1"

See merge request !11709
```
  e20eb712
- Merge branch 'fix-i18-docs' into 'master' · 0a14f9bd
  Douwe Maan authored May 25, 2017
```
Add small update for the i18n guide.

See merge request !11719
```
  0a14f9bd
- Add small update for the i18n guide. · 07eeb5d2
  Ruben Davila authored May 25, 2017
  
  07eeb5d2
- Merge branch 'issue_19262' into 'master' · 67ea6389
  Douwe Maan authored May 25, 2017
```
Prevent commits from upstream repositories to be re-processed by forks

Closes #19262

See merge request !11511
```
  67ea6389
- Merge branch 'winh-label-textcolor-default' into 'master' · 3ba9702d
  Grzegorz Bizon authored May 25, 2017
```
Provide default for calculating label text color

Closes #32728

See merge request !11681
```
  3ba9702d
- Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master' · b3b6c781
  Douwe Maan authored May 25, 2017
```
Bugfix: Always use the default language when generating emails.

Closes #32748

See merge request !11662
```
  b3b6c781
- update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error · 643a10fc
  Mike Greiling authored May 25, 2017
  
  643a10fc
- update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin · de451a8c
  Mike Greiling authored May 25, 2017
  
  de451a8c
- name all webpack chunks to improve long term cacheability · 5270edb7
  Mike Greiling authored May 25, 2017
  
  5270edb7
- add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin · 5c0f506d
  Mike Greiling authored May 25, 2017
  
  5c0f506d
- upgrade to latest webpack version · 4f6ca7bc
  Mike Greiling authored May 25, 2017
  
  4f6ca7bc
- Only use DROP INDEX CONCURRENTLY on postgreql 9.2+ · eb21f932
  Nick Thomas authored May 25, 2017
  
  eb21f932
- Provide default for calculating label text color (!11681) · f565c439
  winh authored May 24, 2017
  
  f565c439
- Add failing test for #32728 · e63d27d8
  winh authored May 24, 2017
  
  e63d27d8
- Merge branch '32762-gitaly-should-be-recompiled-when-gitaly_server_version-changes' into 'master' · 43c3614e
  Robert Speicher authored May 25, 2017
```
Recompile test env Gitaly when `GITALY_SERVER_VERSION` fails

Closes #32762

See merge request !11664
```
  43c3614e
- Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into 'master' · 41441445
  Annabel Dunstone Gray authored May 25, 2017
```
Fix note header author and time ago wrapping in parallel diff

Closes #32801

See merge request !11702
```
  41441445
- Merge branch 'dm-more-dependency-linkers' into 'master' · d9835145
  Grzegorz Bizon authored May 25, 2017
```
Autolink package names in more dependency files

See merge request !11226
```
  d9835145
- Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master' · d70f7f5d
  Phil Hughes authored May 25, 2017
```
Fix filtered search issuable empty state exception

Closes #31455

See merge request !11347
```
  d70f7f5d
- Merge branch 'add-back-margin-to-note-text' into 'master' · 0fccbdbc
  Annabel Dunstone Gray authored May 25, 2017
```
Remove 0 margin bottom for last paragraph on note text

See merge request !11699
```
  0fccbdbc