Commits · 4ab0822f759b4a3db7b2d0f3b4560025f1758147 · nexedi / gitlab-ce

23 Mar, 2017 1 commit
- Fix a vue import to account for a change in style · 4ab0822f
  Nick Thomas authored Mar 23, 2017
  
  4ab0822f
22 Mar, 2017 39 commits
- Resolve conflicts · 6e763b28
  Rémy Coutable authored Mar 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  6e763b28
- Merge remote-tracking branch 'ce/master' into rc/ce-to-ee-wednesday · 061bba7e
  Rémy Coutable authored Mar 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  061bba7e
- Merge branch 'ce_upstream' into 'master' · 332dad45
  Rémy Coutable authored Mar 22, 2017
```
CE upstream

Closes gitlab-ce#29554

See merge request !1475
```
  332dad45
- Merge branch 'profile-project-pagination-json-fix' into 'master' · c62314ab
  Jacob Schatz authored Mar 22, 2017
```
Fixed pagination in projects & snippets on user page

Closes #29624

See merge request !10048
```
  c62314ab
- Merge branch 'patch-11' into 'master' · 71b52e75
  Rémy Coutable authored Mar 22, 2017
```
Update 8.13-to-8.14.md: Fixed gitlab-shell version

See merge request !10125
```
  71b52e75
- Merge branch 'docs/deploy-boards' into 'master' · 28baca8a
  Achilleas Pipinellis authored Mar 22, 2017
```
Add Deploy Boards docs

Closes #1932

See merge request !1467
```
  28baca8a
- Merge branch 'add-gitlab-geo-tracking-db-docs' into 'master' · 53599798
  Achilleas Pipinellis authored Mar 22, 2017
```
Add instructions for enabling the tracking DB for Geo

See merge request !1482
```
  53599798
- Add the Disaster Recovery info for source installations · 883bb6de
  Achilleas Pipinellis authored Mar 22, 2017
```
[ci skip]
```
  883bb6de
- Merge branch 'geo-90-upgrade-doc' into 'master' · 61c63d98
  Stan Hu authored Mar 22, 2017
```
Update instructions for GitLab 9.0 with Geo

See merge request !1478
```
  61c63d98
- Add NTP example · 63250e50
  Stan Hu authored Mar 22, 2017
```
[ci skip]
```
  63250e50
- Fix ordering of migration step · c8e009fe
  Stan Hu authored Mar 22, 2017
```
[ci skip]
```
  c8e009fe
- Add a step in source about creating the tracking DB · 31b18049
  Stan Hu authored Mar 22, 2017
```
[ci skip]
```
  31b18049
- Add note about setting up database_geo.yml and use geo:db:migrate · 94522dbb
  Stan Hu authored Mar 22, 2017
```
[ci skip]
```
  94522dbb
- Change geo:db:setup to geo:db:migrate · 86dc952a
  Stan Hu authored Mar 22, 2017
```
[ci skip]
```
  86dc952a
- Add note about DR alpha · 6c7dd3d9
  Stan Hu authored Mar 22, 2017
```
[ci skip]
```
  6c7dd3d9
- Fix random failing spec · 87b81fa6
  Valery Sizov authored Mar 22, 2017
  
  87b81fa6
- Add database_geo.yml notes in source · bf7aa077
  Stan Hu authored Mar 22, 2017
```
[ci skip]
```
  bf7aa077
- Added note about steps only required for DR Alpha · 7e2300e7
  Regis Freyd authored Mar 22, 2017
  
  7e2300e7
- Merge branch '29775-route-changes' into 'master' · 6194db8c
  Sean McGivern authored Mar 22, 2017
```
Resolve "Follow-up from "Escape route path for LIKE queries""

Closes #29775

See merge request !10137
```
  6194db8c
- Merge branch '29483-spam-check-only-title-and-description' into 'master' · 85ffd85a
  Sean McGivern authored Mar 22, 2017
```
Spam check only when Snippet / Issue "title" or "description" are changed

Closes #29483 and #29645

See merge request !10104
```
  85ffd85a
- Merge branch 'add-todos-shortcut' into 'master' · 78840333
  Sean McGivern authored Mar 22, 2017
```
Add global `g t` shortcut to go to todos

See merge request !10041
```
  78840333
- Add spec that tests ‘LIKE’ query for routes with _ · d618d010
  Jarka Kadlecova authored Mar 22, 2017
  
  d618d010
- Remove not necessary specs · 95197ee3
  Jarka Kadlecova authored Mar 22, 2017
  
  95197ee3
- Merge branch 'fix-changelog-9-0' into 'master' · 141ee129
  Sean McGivern authored Mar 22, 2017
```
Move the 9.0.0 CHANGELOG entries to the top

See merge request !10136
```
  141ee129
- Merge branch 'pipelines-build-tooltip' into 'master' · 74459e0c
  Filipa Lacerda authored Mar 22, 2017
```
Fixed the job tootip being cut-off

Closes #29800

See merge request !10135
```
  74459e0c
- Merge branch 'resolve-global-vue-ee' into 'master' · ca780e27
  Filipa Lacerda authored Mar 22, 2017
```
Port of 'resolve-global-vue' to EE

See merge request !1457
```
  ca780e27
- Move the 9.0.0 CHANGELOG entries to the top · c94172ee
  Rémy Coutable authored Mar 22, 2017
```
[ci skip]
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c94172ee
- Merge remote-tracking branch 'origin/master' into ce_upstream · 1338fdf4
  Rémy Coutable authored Mar 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1338fdf4
- Fix wrong resolution · fb49b072
  Rémy Coutable authored Mar 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fb49b072
- Update CHANGELOG.md for 9.0.0 · bd90f502
  James Lopez authored Mar 22, 2017
```
[ci skip]
```
  bd90f502
- Update CHANGELOG.md for 9.0.0 · 9b477ff1
  James Lopez authored Mar 22, 2017
```
[ci skip]
```
  9b477ff1
- Update CHANGELOG-EE.md for 9.0.0-ee · ce04ba4d
  James Lopez authored Mar 22, 2017
```
[ci skip]
```
  ce04ba4d
- Fixed the job tootip being cut-off · d48b95e2
  Phil Hughes authored Mar 22, 2017
```
Closes #29800
```
  d48b95e2
- Merge branch 'zj-clean-gems' into 'master' · 0cafbd79
  Rémy Coutable authored Mar 22, 2017
```
Clean cache after bundling

See merge request !10047
```
  0cafbd79
- Fix random failure caused by spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb · 3b25d1c7
  Valery Sizov authored Mar 22, 2017
  
  3b25d1c7
- Fix database instructions for Geo · 29efd392
  Gabriel Mazetto authored Mar 22, 2017
  
  29efd392
- Restart GitLab before reconfigure because of Redis bug · 1d12fceb
  Achilleas Pipinellis authored Mar 22, 2017
```
[ci skip]
```
  1d12fceb
- Clarify some Kubernetes concepts · 8c641bff
  Achilleas Pipinellis authored Mar 22, 2017
```
[ci skip]
```
  8c641bff
- remove additional uses of Vue in global scope · 98e4829c
  Mike Greiling authored Mar 17, 2017
  
  98e4829c