Commits · aa57a76fbcf6a2ac45a5fff053c197704abccb8a · nexedi / gitlab-ce · GitLab

18 Jul, 2017 23 commits
- Rescue database errors / connection for Geo.enabled? and return false · aa57a76f
  Gabriel Mazetto authored Jul 19, 2017
  
  aa57a76f
- Fix specs · b05f9e0f
  Gabriel Mazetto authored Jul 17, 2017
  
  b05f9e0f
- Remove extra prepare_build instruction no longer needed · 8c4396c7
  Gabriel Mazetto authored Jul 06, 2017
  
  8c4396c7
- Changelog · d28f2b84
  Gabriel Mazetto authored Jul 06, 2017
  
  d28f2b84
- Remove geo_primary_role and geo_secondary_role configs and methods · 7d5154d2
  Gabriel Mazetto authored Jul 06, 2017
  
  7d5154d2
- Remove `secondary_role_enabled?` from the health_check and improve specs · 1ea4b4d0
  Gabriel Mazetto authored Jul 06, 2017
  
  1ea4b4d0
- Use `primary?` and `secondary?` instead of the *_role_enabled? · c808f8c5
  Gabriel Mazetto authored Jul 06, 2017
  
  c808f8c5
- Use `geo_database_configured?` instead of `secondary_role_enabled?` · 3c562211
  Gabriel Mazetto authored Jul 06, 2017
  
  3c562211
- Raise exception when Geo secondary database is not configured · bbeeaad3
  Gabriel Mazetto authored Jul 06, 2017
```
This is used by ActiveRecord before establishing a connection.
Otherwise the user would receive a crypt `relation "xxx" does not exist"
exception.
```
  bbeeaad3
- Update CHANGELOG.md for 9.3.7 · 85608902
  Clement Ho authored Jul 18, 2017
```
[ci skip]
```
  85608902
- Update CHANGELOG-EE.md for 9.3.7-ee · 0c189abe
  Clement Ho authored Jul 18, 2017
```
[ci skip]
```
  0c189abe
- Merge branch '32561-opaque-avatar-border' into 'master' · 616ab6a3
  Annabel Dunstone Gray authored Jul 18, 2017
```
Update avatar border to be opaque for better stacking

Closes gitlab-ce#32561

See merge request !2462
```
  616ab6a3
- Merge branch 'ce-to-ee' into 'master' · f001097f
  Dmitriy Zaporozhets authored Jul 18, 2017
```
CE Upstream - Monday

See merge request !2453
```
  f001097f
- Fix projects/update_service_spec to match new error message · 63174d23
  Dmitriy Zaporozhets authored Jul 18, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  63174d23
- Update avatar border to be opaque for better stacking · 4e25b7ad
  Eric Eastwood authored Jul 18, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32561
```
  4e25b7ad
- Fix project update service · c57eb3f9
  Dmitriy Zaporozhets authored Jul 18, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c57eb3f9
- Merge branch '2896-error-out-clone-url-prefix-nil' into 'master' · 9bd93670
  Sean McGivern authored Jul 18, 2017
```
Geo: improve error message when clone_url_prefix is nil

Closes #2896

See merge request !2410
```
  9bd93670
- Make primary_ssh_path_prefix public · f8af3aba
  Gabriel Mazetto authored Jul 18, 2017
  
  f8af3aba
- Use shared examples to test base sync and dependent services · 11aea03f
  Gabriel Mazetto authored Jul 15, 2017
  
  11aea03f
- Improved BaseSyncService specs · a531a2d9
  Gabriel Mazetto authored Jul 14, 2017
  
  a531a2d9
- Rescue from Geo::EmptyCloneUrlPrefixError in sync services · 8311839f
  Gabriel Mazetto authored Jul 12, 2017
  
  8311839f
- Remove old cache key from geo that is not used anymore · 169c894b
  Gabriel Mazetto authored Jul 12, 2017
  
  169c894b
- Raise error when clone_url_prefix is nil and add specs · 62534363
  Gabriel Mazetto authored Jul 12, 2017
  
  62534363
17 Jul, 2017 17 commits
- Fix use of missing scss var · df385625
  Dmitriy Zaporozhets authored Jul 17, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  df385625
- Fix conflict in doc/administration/auth/ldap.md · 6b983071
  Dmitriy Zaporozhets authored Jul 17, 2017
  
  6b983071
- Merge branch 'ee-group-sub-settings-new-sidebar' into 'master' · 4ed9c9f9
  Annabel Dunstone Gray authored Jul 17, 2017
```
EE port of group-sub-settings-new-sidebar

See merge request !2454
```
  4ed9c9f9
- fix missing conflict in doc/..../merge_requests/index.md · 0606dae5
  Marcia Ramos authored Jul 17, 2017
  
  0606dae5
- Merge branch 'ce-to-ee' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee · 57c71991
  Marcia Ramos authored Jul 17, 2017
  
  57c71991
- fix conflict (doc/workflow/groups.md) · d918e2a9
  Marcia Ramos authored Jul 17, 2017
  
  d918e2a9
- fix conflict (doc/user/project/merge_request/index) · 88632c97
  Marcia Ramos authored Jul 17, 2017
  
  88632c97
- fix conflict (doc/user/project/issues/issues_functionalitites) · f77ca2b4
  Marcia Ramos authored Jul 17, 2017
  
  f77ca2b4
- Fix test coverage conflict in the README.md · e9847391
  Dmitriy Zaporozhets authored Jul 17, 2017
  
  e9847391
- fix conflict (doc/user/project/issues/index) · 27c51134
  Marcia Ramos authored Jul 17, 2017
  
  27c51134
- fix conflict (doc/user/group/index) · c7226edf
  Marcia Ramos authored Jul 17, 2017
  
  c7226edf
- resolve conflict (doc/ee/readme) · 59d51f3f
  Marcia Ramos authored Jul 17, 2017
  
  59d51f3f
- Merge branch 'ee-34075-pipelines-count-mt' into 'master' · b93aef57
  Phil Hughes authored Jul 17, 2017
```
Ee 34075 pipelines count mt

See merge request !2436
```
  b93aef57
- Ee 34075 pipelines count mt · 0c17d2dc
  Filipa Lacerda authored Jul 17, 2017
  
  0c17d2dc
- Merge branch 'js-reduce-ce-ee-conflicts' into 'master' · b64b16ca
  Dmitriy Zaporozhets authored Jul 17, 2017
```
Move EE specific code to their respective places

See merge request !2441
```
  b64b16ca
- EE port of group-sub-settings-new-sidebar · 65dd5262
  Phil Hughes authored Jul 17, 2017
  
  65dd5262
- Resolve conflicts in project update service · 7ecaae69
  Grzegorz Bizon authored Jul 17, 2017
  
  7ecaae69