Commits · 38ee63eeabca8b206ada346d058f237340559b0b · nexedi / gitlab-ce

09 May, 2017 3 commits
- 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 37 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
- Add wait_for_vue_resource after clicking Approve · 5bd8ed4a
  Oswaldo Ferreira authored May 08, 2017
  
  5bd8ed4a
- Fix resolving of CONTRIBUTING.md[ci skip] · 31a3ba1a
  Valery Sizov authored May 08, 2017
  
  31a3ba1a
- Remove unneeded edited_text assign · 4ea42240
  Luke "Jared" Bennett authored May 08, 2017
  
  4ea42240
- Merge branch 'sh-fix-mysql-almost-there-spec-failure' into 'master' · f97e830c
  Sean McGivern authored May 08, 2017
```
Fix sub-second timing comparison error for Devise confirmation period

Closes #2362

See merge request !1843
```
  f97e830c
- Just assert the existence of the timeago element · f0cf32bf
  Luke "Jared" Bennett authored May 08, 2017
  
  f0cf32bf
- Resolve config/webpack.config.js · 4e08b85a
  Valery Sizov authored May 08, 2017
  
  4e08b85a
- Resolve conflict in db/schema.rb · 026a5d73
  Valery Sizov authored May 08, 2017
  
  026a5d73
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream · 551c2aea
  Valery Sizov authored May 08, 2017
  
  551c2aea
- Resolve CONTRIBUTING.md · c47074b6
  Valery Sizov authored May 08, 2017
  
  c47074b6
- Resolve spec/lib/gitlab/import_export/safe_model_attributes.yml · 91e0ec30
  Valery Sizov authored May 08, 2017
  
  91e0ec30
- Resolve schema.rb · 420592a6
  Valery Sizov authored May 08, 2017
  
  420592a6
- Check for all possible timeago strings that can be rendered in a few minutes.... · 7e33696e
  Luke "Jared" Bennett authored May 08, 2017
```
Check for all possible timeago strings that can be rendered in a few minutes. We cannot rely on 'less than a minute ago'
```
  7e33696e
- Add a CE to EE migration guide for 9.2 · 3c2e292f
  Timothy Andrew authored May 08, 2017
  
  3c2e292f
- Resolve spec/factories/groups.rb[ci skip] · a2d8103c
  Valery Sizov authored May 08, 2017
  
  a2d8103c
- Resolve doc/api/issues.md [ci skip] · 17200ac3
  Valery Sizov authored May 08, 2017
  
  17200ac3
- Resolve app/workers/post_receive.rb and app/models/project_wiki.rb[ci skip] · c45c51ff
  Valery Sizov authored May 08, 2017
  
  c45c51ff
- Merge branch 'docs/new-topic-issues-ee' into 'master' · b3e51096
  Sean Packham (GitLab) authored May 08, 2017
```
New doc topic: issues

See merge request !1827
```
  b3e51096
- New doc topic: issues · 4aebda5f
  Marcia Ramos authored May 08, 2017
  
  4aebda5f
- Merge branch 'ee-17361-redirect-renamed-paths' into 'master' · 7fc2787e
  Sean McGivern authored May 08, 2017
```
Port of 17361-redirect-renamed-paths to EE

See merge request !1838
```
  7fc2787e
- Testing: Commenting after hook for waiting complete request · 46906ac3
  Oswaldo Ferreira authored May 07, 2017
  
  46906ac3