Commits · 254deeda966928c87a2f57070031ca479c4613f8 · nexedi / gitlab-ce

08 May, 2017 16 commits
- Fix of seed_fu file · 254deeda
  Valery Sizov authored May 08, 2017
  
  254deeda
- 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
- Fix resolving of CONTRIBUTING.md[ci skip] · 31a3ba1a
  Valery Sizov authored May 08, 2017
  
  31a3ba1a
- 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
- 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
07 May, 2017 6 commits
- Revert "Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master' · b22663a5
  Stan Hu authored May 07, 2017
```
This reverts commit 7041de94.
```
  b22663a5
- Merge branch 'attemp-to-fix-issue_sidebar_spec-again' into 'master' · 12d53cbe
  Stan Hu authored May 06, 2017
```
Trigger click instead of actual click to make sure the right button is always hit

Closes #30504

See merge request !11127
```
  12d53cbe
- Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master' · 7041de94
  Stan Hu authored May 07, 2017
```
Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection call …

See merge request !11150
```
  7041de94
- Merge branch 'another-attempt-at-access_control_ce_spec-transient-failure' into 'master' · 8fc6f18f
  Stan Hu authored May 07, 2017
```
Another attempt at access_control_ce_spec

Closes #31827

See merge request !11123
```
  8fc6f18f
- Merge branch 'attempt-to-fix-board_with_milestone_spec-1' into 'master' · e3ad1bb4
  Stan Hu authored May 07, 2017
```
Improve board_with_milestone_spec

Closes #1960

See merge request !1840
```
  e3ad1bb4
- Merge branch 'correctly-stub-application-settings-in_signup_spec' into 'master' · 43141f7d
  Stan Hu authored May 07, 2017
```
Correctly stub application settings in signup_spec.rb

See merge request !11151
```
  43141f7d
06 May, 2017 16 commits
- Added waiting finds for async inserted elements · 9e25ba01
  Luke "Jared" Bennett authored May 06, 2017
  
  9e25ba01
- Fix form spec conflict · 87f04e5d
  Clement Ho authored May 06, 2017
  
  87f04e5d
- Resolve a bunch of conflicts · 0603cfbb
  Valery Sizov authored May 06, 2017
  
  0603cfbb
- Fix `Routable.find_by_full_path` on MySQL · a11cfdf8
  Sean McGivern authored May 06, 2017
  
  a11cfdf8
- Fix sidekiq_queues.yml · 6a733664
  Sean McGivern authored May 06, 2017
  
  6a733664
- Fix CE conflicts from master · 7c4d25a4
  Clement Ho authored May 06, 2017
  
  7c4d25a4
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream[ci skip] · d0ddfcd0
  Valery Sizov authored May 06, 2017
  
  d0ddfcd0
- Resolve interpret_service.rb and its spec · 826d6526
  Valery Sizov authored May 06, 2017
  
  826d6526
- Fix FE conflicts · 0ff8316b
  Clement Ho authored May 06, 2017
  
  0ff8316b
- Port of 17361-redirect-renamed-paths to EE · 1be0e995
  Michael Kozono authored May 05, 2017
  
  1be0e995
- Merge remote-tracking branch 'origin/multiple_assignees_review' into ce_upstream[ci skip] · e4fa1385
  Valery Sizov authored May 06, 2017
  
  e4fa1385
- Merge branch 'use-absolute-path-for-gettext-config' into 'master' · 6ce1df41
  Stan Hu authored May 06, 2017
```
Use an absolute path for locale path in FastGettext config

See merge request !11141
```
  6ce1df41
- Merge branch 'attemp-to-fix-issue_sidebar_spec-again' into 'master' · 62f856a3
  Stan Hu authored May 06, 2017
```
Trigger click instead of actual click to make sure the right button is always hit

Closes #30504

See merge request !11127
```
  62f856a3
- Merge branch 'fix/fork-spec-mysql' into 'master' · 00d9a0e3
  Stan Hu authored May 06, 2017
```
Fix fork_spec failure to do with mySQL

Closes #31870

See merge request !11121
```
  00d9a0e3
- Merge branch 'fix/fork-spec-mysql' into 'master' · 58166f03
  Stan Hu authored May 06, 2017
```
Fix fork_spec failure to do with mySQL

Closes #31870

See merge request !11121
```
  58166f03
- Use an absolute path for locale path in FastGettext config · 61d0ac55
  Ruben Davila authored May 05, 2017
```
Unicorn was unable to start due to this bad config on Omnibus.
```
  61d0ac55
05 May, 2017 2 commits
- Merge branch 'winh-visual-token-labels' into 'master' · a4c90a41
  Jacob Schatz authored May 05, 2017
```
Colorize labels in issue search field

Closes #30467

See merge request !11047
```
  a4c90a41
- Colorize labels in issue search field · b51f2a60
  Winnie Hellmann authored May 05, 2017
  
  b51f2a60