Commits · da546347a14e1a09d0dffba7c085b6817dae6a0d · nexedi / gitlab-ce

28 Sep, 2017 1 commit
- Add period to multi-sentence fast-foward related messages · da546347
  Eric Eastwood authored Sep 28, 2017
```
See https://gitlab.com/gitlab-org/gitlab-ce/issues/38251
```
  da546347
26 Sep, 2017 15 commits
- Add test for EE-only for "semi-linear history" strategy · b37069b7
  Eric Eastwood authored Sep 26, 2017
  
  b37069b7
- Add test to check for project settings merge strategies · a8bc3076
  Eric Eastwood authored Sep 26, 2017
  
  a8bc3076
- Use js- classes instead of Vue refs in tests for some perf · 81da3829
  Eric Eastwood authored Sep 26, 2017
```
See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272#note_41419104

Conflicts:
	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
```
  81da3829
- Merge branch 'master' into move_ff_to_ce · ac94c74a
  Eric Eastwood authored Sep 26, 2017
```
Conflicts:
	app/models/license.rb
```
  ac94c74a
- Merge branch 'rc/update-testing-docs-ee' into 'master' · dba5042a
  Grzegorz Bizon authored Sep 26, 2017
```
Improve the IssuableFinder#SCALAR_PARAMS array formatting and add EE_SCALAR_PARAMS

See merge request gitlab-org/gitlab-ee!3018
```
  dba5042a
- Merge branch '3360-geo-skip-unhealthy-shards' into 'master' · ffc81ac8
  Douwe Maan authored Sep 26, 2017
```
Only run Geo backfill for projects on healthy shards

Closes #3360

See merge request gitlab-org/gitlab-ee!2974
```
  ffc81ac8
- Improve the IssuableFinder#SCALAR_PARAMS array formatting and add EE_SCALAR_PARAMS · 828ff249
  Rémy Coutable authored Sep 26, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  828ff249
- Only run Geo backfill for projects on healthy shards · 30c34480
  Nick Thomas authored Sep 20, 2017
  
  30c34480
- Merge branch 'docs/helm-chart-upgrade-ee' into 'master' · 02f78b09
  Marcia Ramos authored Sep 26, 2017
```
Add note for upgrading Helm chart prior to 1.3.5

See merge request gitlab-org/gitlab-ee!3016
```
  02f78b09
- Merge branch '38374-add-note-for-upgrading-helm-chart-prior-to-1-3-5-docs' into 'master' · 308de142
  Achilleas Pipinellis authored Sep 26, 2017
```
Add note for upgrading Helm chart prior to 1.3.5 - docs

Closes #38374

See merge request gitlab-org/gitlab-ce!14491
```
  308de142
- Merge branch 'ee-remove-old-nav-styles' into 'master' · 93044dec
  Phil Hughes authored Sep 26, 2017
```
Port of remove-old-nav-styles to EE

See merge request gitlab-org/gitlab-ee!3004
```
  93044dec
- Port of remove-old-nav-styles to EE · fcf5e1b4
  Annabel Dunstone Gray authored Sep 26, 2017
  
  fcf5e1b4
- Merge branch 'ce-to-ee' into 'master' · d537d251
  Dmitriy Zaporozhets authored Sep 26, 2017
```
CE Upstream - Monday

Closes gitaly#524

See merge request gitlab-org/gitlab-ee!3007
```
  d537d251
- Merge branch 'sh-geo-handle-no-current-geo-node' into 'master' · 46a1af50
  Nick Thomas authored Sep 26, 2017
```
Gracefully handle case where current instance is not a Geo Node

See merge request gitlab-org/gitlab-ee!2977
```
  46a1af50
- Merge branch 'send-valid-project-path-as-name-for-jira' into 'master' · ac6378c0
  Sean McGivern authored Sep 26, 2017
```
Send valid project path as name for Jira dev panel integration

See merge request gitlab-org/gitlab-ee!3005
```
  ac6378c0
25 Sep, 2017 22 commits
- Merge branch '3453-remove-geo-repository-sync-backoff' into 'master' · a5c0a3e8
  Stan Hu authored Sep 25, 2017
```
Remove the backoff delay from Geo repository sync

Closes #3453

See merge request gitlab-org/gitlab-ee!3009
```
  a5c0a3e8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee · 511f5570
  Nick Thomas authored Sep 25, 2017
  
  511f5570
- CE->EE: resolve conflicts in app/views/projects/branches/index.html.haml · 806371bf
  Nick Thomas authored Sep 25, 2017
  
  806371bf
- Merge branch '3516-fix-nomethoderror-zero-on-nil' into 'master' · 131e1db5
  Sean McGivern authored Sep 25, 2017
```
Fix an error reporting some failures in the elasticsearch indexer

Closes #3516

See merge request gitlab-org/gitlab-ee!2998
```
  131e1db5
- Remove the backoff delay from Geo repository sync · 9110e558
  Nick Thomas authored Sep 25, 2017
  
  9110e558
- Merge branch 'improve_sorting_list' into 'master' · 0c42fb8b
  Douwe Maan authored Sep 25, 2017
```
Improve list of sorting options

See merge request gitlab-org/gitlab-ee!3001
```
  0c42fb8b
- Merge branch 'sh-geo-handle-ssl-errors' into 'master' · 3bd42168
  Nick Thomas authored Sep 25, 2017
```
Gracefully handle and report SSL connection errors in Geo admin screen

Closes #3460

See merge request gitlab-org/gitlab-ee!2985
```
  3bd42168
- Merge branch 'docs-embedded-consul' into 'master' · 1cdc0039
  Achilleas Pipinellis authored Sep 25, 2017
```
Point to embedded Consul

See merge request gitlab-org/gitlab-ee!2980
```
  1cdc0039
- Point to embedded Consul · f4ba6b93
  Chenjerai Katanda authored Sep 25, 2017
  
  f4ba6b93
- Improve list of sorting options · c6728e13
  blackst0ne authored Sep 23, 2017
  
  c6728e13
- Resolves usage-data conflicts · 924885e5
  Tiago Botelho authored Sep 25, 2017
  
  924885e5
- Merge branch 'rc/refactor-project_policy_spec' into 'master' · c5f7e20a
  Douwe Maan authored Sep 25, 2017
```
Refactor spec/policies/project_policy_spec.rb to minimize the diff with CE

See merge request gitlab-org/gitlab-ee!2953
```
  c5f7e20a
- Resolve conflict in app/views/projects/branches/_branch.html.haml · 61a5537e
  Dmitriy Zaporozhets authored Sep 25, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  61a5537e
- Resolve conflict in app/helpers/sorting_helper.rb · 774252aa
  Dmitriy Zaporozhets authored Sep 25, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  774252aa
- Merge remote-tracking branch 'ce-com/master' into ce-to-ee · 8450925e
  Dmitriy Zaporozhets authored Sep 25, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8450925e
- Merge branch 'sh-remove-additional-grit-settings' into 'master' · 7da72a0d
  Rémy Coutable authored Sep 25, 2017
```
Remove Grit settings from default settings

See merge request gitlab-org/gitlab-ce!14465
```
  7da72a0d
- Merge branch 'master' into 'master' · 6fb05fee
  Rémy Coutable authored Sep 25, 2017
```
fix minor spelling mistakes

See merge request gitlab-org/gitlab-ee!3006
```
  6fb05fee
- fix minor spelling mistakes · 95ae0234
  René Genz authored Sep 25, 2017
  
  95ae0234
- Merge branch 'master' into 'master' · 12edee4b
  Rémy Coutable authored Sep 25, 2017
```
fix minor spelling mistakes

See merge request gitlab-org/gitlab-ce!14467
```
  12edee4b
- Define Gitlab::Geo.primary_node_configured? abstraction · 304aebc2
  Stan Hu authored Sep 24, 2017
  
  304aebc2
- Fix navigation issues when primary Geo node has been destroyed · 9e19864b
  Stan Hu authored Sep 21, 2017
  
  9e19864b
- Gracefully handle case where current instance is not a Geo Node · 59652761
  Stan Hu authored Sep 20, 2017
```
If the primary Geo Node were deleted or not configured properly,
attempts to retrieve the status of secondaries would fail with an
Error 500.
```
  59652761
24 Sep, 2017 2 commits
- Merge branch 'docs-fix-link-1' into 'master' · f29bf995
  Achilleas Pipinellis authored Sep 24, 2017
```
Docs: fix internal link

See merge request gitlab-org/gitlab-ee!3003
```
  f29bf995
- Remove duplicate CHANGELOG entries · 2d3d914a
  Stan Hu authored Sep 23, 2017
  
  2d3d914a