Commits · 67d3894c7e4731b2e2b1d86c6350a45df2000568 · nexedi / gitlab-ce

23 Feb, 2017 34 commits
- Old migration doesn’t require downtime · 67d3894c
  Douwe Maan authored Feb 22, 2017
  
  67d3894c
- Fix code for cops · 3a513471
  Douwe Maan authored Feb 22, 2017
  
  3a513471
- Fix specs · 8dcc8574
  Douwe Maan authored Feb 22, 2017
  
  8dcc8574
- Enable Style/ConditionalAssignment · e78a4903
  Douwe Maan authored Feb 21, 2017
  
  e78a4903
- Enable Style/ColonMethodCall · c809b104
  Douwe Maan authored Feb 21, 2017
  
  c809b104
- Disable Style/BracesAroundHashParameters · 24e7e0be
  Douwe Maan authored Feb 21, 2017
  
  24e7e0be
- Enable Style/BarePercentLiterals · 97fc6811
  Douwe Maan authored Feb 21, 2017
  
  97fc6811
- Enable Security/JSONLoad · 367e7178
  Douwe Maan authored Feb 21, 2017
  
  367e7178
- Enable Rails/Validation · 1fca4122
  Douwe Maan authored Feb 21, 2017
  
  1fca4122
- Disable Rails/OutputSafety · c5608374
  Douwe Maan authored Feb 21, 2017
  
  c5608374
- Disable Rails/DynamicFindBy · 507cd734
  Douwe Maan authored Feb 21, 2017
  
  507cd734
- Enable Performance/RedundantMatch · 5b8496ca
  Douwe Maan authored Feb 21, 2017
  
  5b8496ca
- Enable Performance/RedundantBlockCall · be14a73a
  Douwe Maan authored Feb 21, 2017
  
  be14a73a
- Disable Lint/UnneededSplatExpansion · 8402a666
  Douwe Maan authored Feb 21, 2017
  
  8402a666
- Enable Lint/UnifiedInteger · 887b8ca4
  Douwe Maan authored Feb 21, 2017
  
  887b8ca4
- Enable Performance/RedundantMerge · 288f4abe
  Douwe Maan authored Feb 21, 2017
  
  288f4abe
- Disable some more cops · 663befc8
  Douwe Maan authored Feb 21, 2017
  
  663befc8
- Disable a few RSpec cops · e0f21a96
  Douwe Maan authored Feb 21, 2017
  
  e0f21a96
- Custom cops don’t need to be mentioned in .rubocop.yml · c141ae45
  Douwe Maan authored Feb 21, 2017
  
  c141ae45
- Disable Lint/UnusedMethodArgument · d91edda3
  Douwe Maan authored Feb 21, 2017
  
  d91edda3
- Disable Style/TrailingCommaInLiteral · 98982c07
  Douwe Maan authored Feb 21, 2017
  
  98982c07
- Enable Style/SpaceInsideBrackets · d1b1ed88
  Douwe Maan authored Feb 21, 2017
  
  d1b1ed88
- Enable Style/MutableConstant · 064dd612
  Douwe Maan authored Feb 21, 2017
  
  064dd612
- Enable Style/DotPosition · 5b8028f0
  Douwe Maan authored Feb 21, 2017
  
  5b8028f0
- Update .rubocop_todo.yml · a101e623
  Douwe Maan authored Feb 21, 2017
  
  a101e623
- Merge branch 'es_doc_improvement' into 'master' · cccedcff
  Valery Sizov authored Feb 23, 2017
```
Update Elasticsearch guide

See merge request !1292
```
  cccedcff
- Merge branch 'rc/ce-to-ee-wednesday' into 'master' · 319e64b5
  Rémy Coutable authored Feb 23, 2017
```
CE Upstream - Wednesday

Closes #1765

See merge request !1281
```
  319e64b5
- Merge branch 'api-notes-entity-fields' into 'master' · 38fd19b4
  Sean McGivern authored Feb 23, 2017
```
Remove deprecated upvotes and downvotes from the notes API

See merge request !1275
```
  38fd19b4
- Link to gitlab-ce MR [ci skip] · b5219db9
  Robert Schilling authored Feb 23, 2017
  
  b5219db9
- Update Elasticsearch guide · 5eba35c0
  Valery Sizov authored Feb 23, 2017
  
  5eba35c0
- Merge branch 'mr-stuck-checking-fix' into 'master' · 7a828482
  Filipa Lacerda authored Feb 23, 2017
```
Re-compile merge request Vue app after jQuery ajax

Closes gitlab-ce#27134

See merge request !1264
```
  7a828482
- Merge remote-tracking branch 'origin/master' into rc/ce-to-ee-wednesday · 7fa3c02e
  Rémy Coutable authored Feb 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7fa3c02e
- Merge branch 'docs/es-requirements' into 'master' · 1bda67b8
  Achilleas Pipinellis authored Feb 23, 2017
```
Add version requirements for Elasticsearch

See merge request !1291
```
  1bda67b8
- Add version requirements for Elasticsearch · f13f1cb5
  Achilleas Pipinellis authored Feb 23, 2017
```
[ci skip]
```
  f13f1cb5
22 Feb, 2017 6 commits
- Merge branch 'dm-no-more-andor-ee' into 'master' · 0115efcb
  Douwe Maan authored Feb 22, 2017
```
No more and/or in EE

See merge request !1284
```
  0115efcb
- Merge branch 'docs/pages-redirect' into 'master' · 227be35f
  Achilleas Pipinellis authored Feb 22, 2017
```
Remove Pages readme

See merge request !1289
```
  227be35f
- Remove Pages readme · 779d212e
  Achilleas Pipinellis authored Feb 22, 2017
```
To prevent a redirect loop in docs.gitlab.com/ce/pages/

[ci skip]
```
  779d212e
- Merge branch 'docs/pages-redirect' into 'master' · 8b962a48
  Achilleas Pipinellis authored Feb 22, 2017
```
Change Pages redirect

See merge request !1288
```
  8b962a48
- Change Pages redirect · ba3705bb
  Achilleas Pipinellis authored Feb 22, 2017
```
[ci skip]
```
  ba3705bb
- Merge branch 'master' into 'api-notes-entity-fields' · e10b0f05
  Robert Schilling authored Feb 22, 2017
```
# Conflicts:
#   doc/api/v3_to_v4.md
```
  e10b0f05