Commits · 05cb97ec4ce85c3c5b24c01f7876c3b5abd9eda0 · nexedi / gitlab-ce

21 Mar, 2017 12 commits
- Fix js lint and rubocop violations · 05cb97ec
  Dmitriy Zaporozhets authored Mar 21, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  05cb97ec
- Merge branch 'master' into 'ce-to-ee' · f85f4c60
  Dmitriy Zaporozhets authored Mar 21, 2017
```
# Conflicts:
#   db/schema.rb
#   package.json
#   spec/javascripts/test_bundle.js
```
  f85f4c60
- Bring file lock button back into UI · 8e5c72f8
  Dmitriy Zaporozhets authored Mar 21, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8e5c72f8
- Fix mr approvals code after notification_service refactoring · c2c89e3e
  Dmitriy Zaporozhets authored Mar 21, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c2c89e3e
- Merge branch 'jej-csv-export-filter-fix' into 'master' · 7b210602
  Douwe Maan authored Mar 21, 2017
```
Fixed filter by label for issues CSV export

Closes #1926

See merge request !1444
```
  7b210602
- Merge branch 'jej-fix-csv-fail-on-authorless-issue' into 'master' · b805ae34
  Douwe Maan authored Mar 21, 2017
```
Prevented Issues CSV export failing when author is nil

Closes #1936

See merge request !1454
```
  b805ae34
- Merge branch 'docs/geo' into 'master' · 214612df
  Stan Hu authored Mar 21, 2017
```
Documentation updates for new Geo features

See merge request !1470
```
  214612df
- Merge remote-tracking branch 'dev/master' · 7c735a7f
  DJ Mountney authored Mar 20, 2017
  
  7c735a7f
- Merge branch 'elastic-security' into 'security' · 10474dbe
  Rémy Coutable authored Feb 21, 2017
```
Rework ES permissions check

See merge request !507
```
  10474dbe
- Update docs for the troubleshooting section · 7bb058c2
  Douglas Barbosa Alexandre authored Mar 20, 2017
```
[ci skip]
```
  7bb058c2
- Update docs for the FAQ section · 5de25e47
  Douglas Barbosa Alexandre authored Mar 20, 2017
  
  5de25e47
- Update docs for the replicating the repositories data step · 00d37721
  Douglas Barbosa Alexandre authored Mar 20, 2017
  
  00d37721
20 Mar, 2017 28 commits
- Merge branch 'make-karma-fast-again-ee' into 'master' · 93e13186
  Alfredo Sumaran authored Mar 20, 2017
```
Port of 'make-karma-fast-again' to EE

See merge request !1455
```
  93e13186
- Merge branch 'issue_27212-ee' into 'master' · 90696194
  Sean McGivern authored Mar 20, 2017
```
CE Backport - Add closed_at field to issues

See merge request !1452
```
  90696194
- Merge branch 'docs/geo-split-omnibus-source' into 'master' · f1924d2b
  Achilleas Pipinellis authored Mar 20, 2017
```
split Geo Omnibus/source info

Closes #1908 and #1917

See merge request !1431
```
  f1924d2b
- Add closed_at field to issues · 77b8bac1
  Felipe Artur authored Mar 15, 2017
  
  77b8bac1
- Merge branch 'fix/1911' into 'master' · 080311e7
  Stan Hu authored Mar 20, 2017
```
Handle missing tracking DB configuration on a Geo secondary node

Closes #1911

See merge request !1436
```
  080311e7
- Fix conflicts in environments components · 44c14a47
  Filipa Lacerda authored Mar 20, 2017
  
  44c14a47
- Merge remote-tracking branch 'ce-com/master' into ce-to-ee · 93f3e906
  Dmitriy Zaporozhets authored Mar 20, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  93f3e906
- Merge branch 'fix-weight-sorting-dropdown' into 'master' · 420d5cd1
  Robert Speicher authored Mar 20, 2017
```
Fix weight sorting dropdown for issues

Closes #537

See merge request !1443
```
  420d5cd1
- Fix weight sorting dropdown for issues · 713ca598
  Clement Ho authored Mar 20, 2017
  
  713ca598
- Merge branch 'routes-lower-case' into 'master' · cd3e4101
  Yorick Peterse authored Mar 20, 2017
```
Remove repeated routes.path check for postgresql database

See merge request !10063
```
  cd3e4101
- Merge branch 'rc/ce-to-ee-wednesday' into 'master' · 9e2c4d03
  Rémy Coutable authored Mar 20, 2017
```
CE Upstream - Wednesday

Closes gitlab-ce#29425, gitlab-ce#29084, gitlab-ce#19742, and gitlab-qa#30

See merge request !1427
```
  9e2c4d03
- Disable the file download scheduler when tracking DB is not available · 65703064
  Douglas Barbosa Alexandre authored Mar 20, 2017
  
  65703064
- Fix the spec to schedule file download when node is disabled · 293f9dae
  Douglas Barbosa Alexandre authored Mar 20, 2017
  
  293f9dae
- Merge branch '29405-fix-project-wiki-update' into 'master' · b075d38c
  Rémy Coutable authored Mar 20, 2017
```
Fix Project Wiki update

Closes #29405

See merge request !9990
```
  b075d38c
- Fix Project Wiki update · 2dd9b8a3
  Dongqing Hu authored Mar 20, 2017
  
  2dd9b8a3
- Merge branch 'feature/gb/qa/do-not-add-license-if-not-present' into 'master' · 12bde5a7
  Rémy Coutable authored Mar 20, 2017
```
Do not add EE license if not set in GitLab QA tests

See merge request !1459
```
  12bde5a7
- Merge branch 'protobuf-3.2.0.2' into 'master' · 915af2dc
  Rémy Coutable authored Mar 20, 2017
```
Use google-protobuf 3.2.0.2

See merge request !10014
```
  915af2dc
- Merge branch 'patch-10' into 'master' · 62194ab4
  Rémy Coutable authored Mar 20, 2017
```
Update 8.12-to-8.13.md: gitlab version 8.13 wants gitlab-shell v3.6.7

See merge request !10071
```
  62194ab4
- Merge branch '29534-todos-performance' into 'master' · 37328406
  Sean McGivern authored Mar 20, 2017
```
Todos performance: Include associations in Finder

See merge request !10076
```
  37328406
- Merge branch 'fix/regressions-in-ci-v4-api' into 'master' · d454e100
  Kamil Trzciński authored Mar 20, 2017
```
Fix regressions introduced while adding CI endpoints in API v4

See merge request !9952
```
  d454e100
- Merge branch '29438-fix-trigger-webhook-for-ref-with-dot' into 'master' · a040e3ba
  Rémy Coutable authored Mar 20, 2017
```
Allow dot in branch name in trigger/builds endpoint in API

Closes #29438

See merge request !10001
```
  a040e3ba
- Allow dot in branch name in trigger/builds endpoint in API · de518e12
  George Andrinopoulos authored Mar 20, 2017
  
  de518e12
- Todos performance: Include associations in Finder · bf41a2e7
  Jarka Kadlecova authored Mar 20, 2017
  
  bf41a2e7
- Prevented Issues CSV export failing when author is nil · 2d68f1fb
  James Edwards-Jones authored Mar 17, 2017
  
  2d68f1fb
- Merge branch '28890-allow-creating-mr-without-target-branch-in-url' into 'master' · 9bfff603
  Sean McGivern authored Mar 20, 2017
```
Allow creating merge request even if target branch is not specified in query params

Closes #28890

See merge request !9968
```
  9bfff603
- Merge branch '29662-allow-unauthenticated-branches-api' into 'master' · 359caf2b
  Sean McGivern authored Mar 20, 2017
```
Allow unauthenticated access to some Branch API GET endpoints

Closes #29662

See merge request !10077
```
  359caf2b
- Use google-protobuf 3.2.0.2 · 6006aaf5
  Jacob Vosmaer authored Mar 16, 2017
  
  6006aaf5
- removed promise polyfil from approvals_spec · 300d5d92
  Phil Hughes authored Mar 20, 2017
  
  300d5d92