Commits · 9e60d57d9fec420ed2c68d6fe1d3e1af90abb4c5 · nexedi / gitlab-ce

26 May, 2017 36 commits
- Move the condition to persisted_environment_variables · 9e60d57d
  Lin Jen-Shin authored May 27, 2017
```
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11695?resolved_conflicts=true#note_30797842
```
  9e60d57d
- Merge branch 'master' into '25680-CI_ENVIRONMENT_URL' · 0e5ee119
  Lin Jen-Shin (godfat) authored May 26, 2017
```
# Conflicts:
#   db/schema.rb
```
  0e5ee119
- Merge branch 'dm-consistent-note-paddings' into 'master' · 3605e430
  Annabel Dunstone Gray authored May 26, 2017
```
More consistent padding of notes, system notes, and note form

See merge request !11720
```
  3605e430
- More consistent padding of notes, system notes, and note form · 41b47965
  Douwe Maan authored May 26, 2017
  
  41b47965
- Merge branch 'dm-dependency-value-regex' into 'master' · f46d3d60
  Grzegorz Bizon authored May 26, 2017
```
Don't allow spaces in dependency linker value regex

See merge request !11721
```
  f46d3d60
- Merge branch... · 5aea2e6e
  Grzegorz Bizon authored May 26, 2017
```
Merge branch '31459-fix-transient-error-caused-by-small-timeout-also-adapt-tests-to-work-locally-correctly' into 'master'

Fix transient CI errors by increasing command execution timeouts from 1s to 30s

Closes #31459

See merge request !11420
```
  5aea2e6e
- Merge branch 'ci-build-pipeline-header-vue' into 'master' · 7911f1c0
  Phil Hughes authored May 26, 2017
```
Creates CI Header component to use in pipelines and job details pages

See merge request !11726
```
  7911f1c0
- Creates CI Header component to use in pipelines and job details pages · f4274ca1
  Filipa Lacerda authored May 26, 2017
  
  f4274ca1
- Merge branch 'enable-final-newline' into 'master' · fe008c52
  Clement Ho authored May 26, 2017
```
Enable final newline

See merge request !11723
```
  fe008c52
- Merge branch 'dm-consistent-last-push-event' into 'master' · 33b622e3
  Robert Speicher authored May 26, 2017
```
Consistently display last push event widget

See merge request !11585
```
  33b622e3
- Merge branch 'fix_counter_cache_invalidation' into 'master' · 70714f57
  Douwe Maan authored May 26, 2017
```
Fix counter cache invalidation

Closes #32854 and #32870

See merge request !11736
```
  70714f57
- Merge branch '32851-update-postgres-requirements' into 'master' · 239e08e6
  Douwe Maan authored May 26, 2017
```
Postgresql 9.2 is the minimum version from GitLab 9.3, not 9.0

See merge request !11737
```
  239e08e6
- Merge branch 'issuable-form-create-label-sub-groups' into 'master' · 48e76046
  Filipa Lacerda authored May 26, 2017
```
Fixed create new label form in issue form not working for sub-group projects

Closes #32906

See merge request !11703
```
  48e76046
- 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
- Fix counters cache invalidation for Issues and Merge Requests · 33687db0
  Valery Sizov authored May 26, 2017
  
  33687db0
- Add spec · c197b72f
  Douwe Maan authored May 26, 2017
  
  c197b72f
- 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
- Enable final newline rule · fe1c1264
  Annabel Dunstone Gray authored May 25, 2017
  
  fe1c1264
- 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
- Postgresql 9.2 is the minimum version from GitLab 9.3, not 9.0 · 28c3ce04
  Nick Thomas authored May 26, 2017
  
  28c3ce04
- 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
- Fix spec · f2a53667
  Douwe Maan authored May 26, 2017
  
  f2a53667
- 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
- Set "expire_in" for counters cache · 0d65fd03
  Valery Sizov authored May 26, 2017
  
  0d65fd03
- 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 4 commits
- Merge branch 'dm-diff-cleanup' into 'master' · 8e2fefc6
  Robert Speicher authored May 25, 2017
```
Clean up diff rendering

See merge request !11390
```
  8e2fefc6
- Don't allow spaces in dependency linker value regex · 31b02fc2
  Douwe Maan authored May 25, 2017
  
  31b02fc2
- Make section connect with window border without extra padding · 7adebd54
  Douwe Maan authored May 25, 2017
  
  7adebd54
- Kill copy button with 🔥 · 343b844a
  Douwe Maan authored May 25, 2017
  
  343b844a