Commits · 32cb7d631ad4aff6506ead81eacdedfc16458be0 · nexedi / gitlab-ce

10 May, 2017 11 commits
- Merge branch 'ee-27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master' · 32cb7d63
  Robert Speicher authored May 10, 2017
```
[EE] Resolve "Use consistent style for trailing commas"

See merge request !1796
```
  32cb7d63
- Merge branch 'enforce-current-user-usage-on-entities-ee' into 'master' · 7664ecf5
  Kamil Trzciński authored May 10, 2017
```
Make all Serializers receive `current_user` instead `user` [EE]

See merge request !1869
```
  7664ecf5
- Ensure all Serializers receive `current_user` instead `user` · a11f5325
  Oswaldo Ferreira authored May 10, 2017
  
  a11f5325
- Merge branch 'ee-32077-pipeline-graph-margins' into 'master' · 0deabec5
  Phil Hughes authored May 10, 2017
```
Port of 32077-pipeline-graph-margins to EE

See merge request !1867
```
  0deabec5
- Port of 32077-pipeline-graph-margins to EE · 774f5246
  Filipa Lacerda authored May 10, 2017
  
  774f5246
- Enable the Style/TrailingCommaInArguments cop · ce16e814
  Rémy Coutable authored May 03, 2017
```
Use the EnforcedStyleForMultiline: no_comma option.
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ce16e814
- Enable the Style/TrailingCommaInLiteral cop · f93bcacb
  Rémy Coutable authored May 03, 2017
```
Use the EnforcedStyleForMultiline: no_comma option.
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f93bcacb
- Merge branch 'license-check-using-feature-list' into 'master' · 8e7c073a
  Douwe Maan authored May 10, 2017
```
Feature availability check using feature list AND license addons

See merge request !1851
```
  8e7c073a
- Merge branch '25226-fix-pipeline-icons-path' into 'master' · 0025fd45
  Filipa Lacerda authored May 10, 2017
```
Fix icons path and mappings

See merge request !1862
```
  0025fd45
- Fix icons path and mappings · fa3ba387
  kushalpandya authored May 10, 2017
  
  fa3ba387
- Merge branch 'ce_upstream' into 'master' · ed127d43
  Clement Ho authored May 10, 2017
```
CE upstream

Closes omnibus-gitlab#2234 and gitlab-ce#31271

See merge request !1837
```
  ed127d43
09 May, 2017 12 commits
- Feature availability check using feature list AND license addons · d80fc724
  Oswaldo Ferreira authored May 08, 2017
  
  d80fc724
- stub error handlers where uncaught Promise rejections currently exist · c4067618
  Mike Greiling authored May 09, 2017
  
  c4067618
- Revert "Fix issue board transient failure" · 0b712ec0
  Mike Greiling authored May 09, 2017
```
This reverts commit 8785aa64.
```
  0b712ec0
- Fix issue board transient failure · 8785aa64
  Clement Ho authored May 09, 2017
  
  8785aa64
- Fix service desk spec · aaafd639
  Clement Ho authored May 09, 2017
  
  aaafd639
- Merge branch 'sh-fix-timecop-not-resetting' into 'master' · 40dac302
  Stan Hu authored May 09, 2017
```
Fix Timecop not unfreezing after spec

Closes #2362

See merge request !1847
```
  40dac302
- Encapsulate service desk error in Error() · f387a164
  Clement Ho authored May 09, 2017
  
  f387a164
- Fixed conflicts · 15c98185
  Phil Hughes authored May 09, 2017
  
  15c98185
- Fix Timecop not unfreezing after spec · f385835b
  Stan Hu authored May 08, 2017
```
Closes #2362 for real
```
  f385835b
- Resolve some conlicts · 38ee63ee
  Valery Sizov authored May 09, 2017
  
  38ee63ee
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream · 6d1d3907
  Valery Sizov authored May 09, 2017
  
  6d1d3907
- Merge branch 'mr-widget-redesign-review-ee' into 'master' · a6d35c27
  Jacob Schatz authored May 09, 2017
```
Merge request widget redesign (EE Version)

Closes #2362

See merge request !1711
```
  a6d35c27
08 May, 2017 17 commits
- Merge branch 'fix-notes_on_personal_snippets_spec-timeago-assertion' into 'master' · 44a66c96
  Sean McGivern authored May 08, 2017
```
Fix notes_on_personal_snippets_spec EE

See merge request !1846
```
  44a66c96
- Merge branch 'sh-fix-mysql-almost-there-spec-failure' into 'master' · 6ab75328
  Sean McGivern authored May 08, 2017
```
Fix sub-second timing comparison error for Devise confirmation period

Closes #2362

See merge request !1843
```
  6ab75328
- fix Elastic spec · ef0b3a56
  Valery Sizov authored May 09, 2017
  
  ef0b3a56
- Avoid issue_ordering spec crash using wait_for_vue_resource · 3618283b
  Oswaldo Ferreira authored May 08, 2017
  
  3618283b
- Add wait_for_vue_resource where needed · 8dce7880
  Oswaldo Ferreira authored May 08, 2017
  
  8dce7880
- MRWidget: Fix approvals and rebase situation. · ccb6b191
  Fatih Acet authored May 08, 2017
  
  ccb6b191
- Fix form spec · 24e9239e
  Clement Ho authored May 08, 2017
  
  24e9239e
- Re-use method for checking all Vue request are done · 9da145c5
  Oswaldo Ferreira authored May 08, 2017
  
  9da145c5
- Replace wait_for_ajax with wait_for_vue_resource on approvals spec · e4e39814
  Oswaldo Ferreira authored May 08, 2017
  
  e4e39814
- Merge branch 'fix-notes_on_personal_snippets_spec-timeago-assertion' into 'master' · 00238139
  Sean McGivern authored May 08, 2017
```
Fix notes_on_personal_snippets_spec EE

See merge request !1846
```
  00238139
- Merge branch 'add-ce-to-ee-guide-for-9-2' into 'master' · 7ece669c
  James Lopez authored May 08, 2017
```
Add a CE to EE migration guide for 9.2

See merge request !1845
```
  7ece669c
- Fix of seed_fu file · 254deeda
  Valery Sizov authored May 08, 2017
  
  254deeda
- Add wait_for_vue_resource for Reopened Vue async req · a6385088
  Oswaldo Ferreira authored May 08, 2017
  
  a6385088
- Fixed JS tests · 8df33720
  Phil Hughes authored May 08, 2017
  
  8df33720
- Fix specs in a scope of CE-EE · a2ec4c67
  Valery Sizov authored May 08, 2017
  
  a2ec4c67
- Uncomment env spinach hook · b61069b9
  Oswaldo Ferreira authored May 08, 2017
  
  b61069b9
- Intermittence adjustments regarding Spinach and Vue · d998f300
  Oswaldo Ferreira authored May 07, 2017
  
  d998f300