Commits · 256aedffb471712563233c9615004c4f1747f759 · nexedi / gitlab-ce

27 Jan, 2016 25 commits
- Merge branch 'fix-mirror' into 'master' · 256aedff
  Robert Speicher authored Jan 27, 2016
```
Fix updating of branches in mirrored repository

Reported in https://gitlab.com/gitlab-org/gitlab-ee/issues/190#note_3373621

See merge request !136
```
  256aedff
- Merge branch 'mirror-empty-repo' into 'master' · 06afaa91
  Robert Speicher authored Jan 27, 2016
```
Don't redirect away from Mirror Repository settings when repo is empty

Fixes #217

See merge request !135
```
  06afaa91
- Merge branch 'elastic_indexer' into 'master' · 8285029d
  Dmitriy Zaporozhets authored Jan 27, 2016
```
Elastic indexer performance improvements

https://gitlab.com/gitlab-org/gitlab-ee/issues/220

See merge request !140
```
  8285029d
- Merge branch 'update_elasticsearch_docs' into 'master' · 2372ccd4
  Achilleas Pipinellis authored Jan 27, 2016
```
Use correct settings for elasticsearch in omnibus-gitlab.

Fixes #227 

See merge request !144
```
  2372ccd4
- Merge branch 'gitlab-geo' into 'master' · 27e2d103
  Dmitriy Zaporozhets authored Jan 27, 2016
```
Gitlab Geo: Authentication

Initial internal API for discovery and authentication for the gitlab-org/gitlab-ee#76

See merge request !112
```
  27e2d103
- Use correct settings for elasticsearch in omnibus-gitlab. · 5fe0e0b8
  Marin Jankovski authored Jan 27, 2016
  
  5fe0e0b8
- Move changelog item · 34f610fb
  Douwe Maan authored Jan 27, 2016
  
  34f610fb
- Merge branch 'master' into mirror-empty-repo · 33d71bbd
  Douwe Maan authored Jan 27, 2016
  
  33d71bbd
- Move changelog item · 6cd70ea3
  Douwe Maan authored Jan 27, 2016
  
  6cd70ea3
- Merge branch 'master' into fix-mirror · 0b9517e5
  Douwe Maan authored Jan 27, 2016
  
  0b9517e5
- bump gitlab-elasticsearch-git · d89a72f4
  Valery Sizov authored Jan 27, 2016
  
  d89a72f4
- update changelog · d93ef29f
  Valery Sizov authored Jan 27, 2016
  
  d93ef29f
- ES: new gitlab-elasticsearch-git gem · dc896455
  Valery Sizov authored Jan 27, 2016
  
  dc896455
- Merge branch 'update_git_annex_docs' into 'master' · aa6ac83e
  Achilleas Pipinellis authored Jan 27, 2016
```
Add administration section to git-annex doc.



See merge request !132
```
  aa6ac83e
- Fix typos, grammar, syntax on git-annex docs · 540b7e47
  Achilleas Pipinellis authored Jan 27, 2016
```
[ci skip]
```
  540b7e47
- Merge branch 'ce_master' into 'master' · 4f2b5a8d
  Valery Sizov authored Jan 27, 2016
```
CE upstream



See merge request !131
```
  4f2b5a8d
- Added RequestStore caching to Gitlab::Geo · b816969d
  Gabriel Mazetto authored Jan 22, 2016
  
  b816969d
- Added specs for Gitlab::Geo · a87f7983
  Gabriel Mazetto authored Jan 22, 2016
  
  a87f7983
- Fix redirect after login when not using gitlab Geo · f90650dd
  Gabriel Mazetto authored Jan 21, 2016
  
  f90650dd
- fixed rubocop offenses · df707134
  Gabriel Mazetto authored Jan 21, 2016
  
  df707134
- Fix redirect after login for non root_urls started on Geo node · 673c1456
  Gabriel Mazetto authored Jan 21, 2016
  
  673c1456
- Fix logout on Gitlab Geo node · 754bb9ac
  Gabriel Mazetto authored Jan 20, 2016
  
  754bb9ac
- Redirect back to readonly node after successful login initiated by Geo · 6f546738
  Gabriel Mazetto authored Jan 19, 2016
  
  6f546738
- Gitlab Geo force authentication with primary node · a1b17f13
  Gabriel Mazetto authored Jan 19, 2016
  
  a1b17f13
- Gitlab Geo initial node discovery · 5ab12ad0
  Gabriel Mazetto authored Jan 13, 2016
  
  5ab12ad0
26 Jan, 2016 10 commits
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_master · 3f2de79b
  Valery Sizov authored Jan 26, 2016
  
  3f2de79b
- monkey patch for mysql 5.7 · 470908f2
  Valery Sizov authored Jan 25, 2016
  
  470908f2
- Match gitlab-shell version on guide with GITLAB_SHELL_VERSION [ci skip] · bd064da6
  Patricio Cano authored Jan 26, 2016
  
  bd064da6
- Merge branch 'elastic_doc_fix' into 'master' · 90c4e424
  Job van der Voort authored Jan 26, 2016
```
Remove '(EE-only)' from Elasticsearch list item



See merge request !137
```
  90c4e424
- Remove '(EE-only)' from Elasticsearch list item · 3a4481f5
  Achilleas Pipinellis authored Jan 26, 2016
```
[ci skip]
```
  3a4481f5
- Fix updating of branches in mirrored repository · ff1f58ec
  Douwe Maan authored Jan 26, 2016
  
  ff1f58ec
- Don't redirect away from Mirror Repository settings when repo is empty. · 5f1a348e
  Douwe Maan authored Jan 26, 2016
  
  5f1a348e
- Clean-up git-annex documentation · f512dbe6
  Achilleas Pipinellis authored Jan 26, 2016
```
- Rearrange sections
- Limit lines to 80 chars
- Fix typos, grammar, etc.

[ci skip]
```
  f512dbe6
- Merge branch 'master' into update_git_annex_docs · fd7eb717
  Achilleas Pipinellis authored Jan 26, 2016
  
  fd7eb717
- Update CHANGELOG-EE · aa2f58eb
  Robert Speicher authored Jan 25, 2016
```
[ci skip]
```
  aa2f58eb
25 Jan, 2016 5 commits
- Remove features/project/builds.feature. The file is removed in CE · df606515
  Kamil Trzcinski authored Jan 25, 2016
  
  df606515
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_master · 2111b0f5
  Valery Sizov authored Jan 25, 2016
  
  2111b0f5
- Merge branch 'rails_update' into 'master' · 0f139331
  Valery Sizov authored Jan 25, 2016
```
Rails updated to 4.2.5

I hope it'll fix weird spec failing (according to https://github.com/rails/rails/pull/22383)

@dzaporozhets @yorickpeterse 

See merge request !2591
```
  0f139331
- Force the CI build to test unzip · 95148341
  Kamil Trzcinski authored Jan 25, 2016
  
  95148341
- Install unzip in build environment [ci skip] · 03ca5b65
  Kamil Trzcinski authored Jan 25, 2016
  
  03ca5b65