Commits · e0bd31189764f814047efcdd011acfc6599efbc5 · nexedi / gitlab-ce

11 Sep, 2017 11 commits
- fix conflict resolution in api/v3/merge_request_diffs · e0bd3118
  Jarka Kadlecova authored Sep 11, 2017
  
  e0bd3118
- Fix broken spec · 9cb9dc40
  Rubén Dávila authored Sep 11, 2017
  
  9cb9dc40
- Fix artifacts_controller_spec · f467ad2b
  Jarka Kadlecova authored Sep 11, 2017
```
based on https://gitlab.com/gitlab-org/gitlab-ce/commit/deaa7f54e016b6ae1051c38abb95586451f470c1
```
  f467ad2b
- fix conflict reoslution for groups/create_service.rb · 5c713f73
  Jarka Kadlecova authored Sep 11, 2017
  
  5c713f73
- Move the test to the correct place · ae10e20f
  Lin Jen-Shin authored Sep 11, 2017
  
  ae10e20f
- Fix specs for renderer_spec.rb · fe89acc3
  Jarka Kadlecova authored Sep 11, 2017
  
  fe89acc3
- Fix conflict resolution for gl_dropdown.js · fa978dbe
  Winnie Hellmann authored Sep 11, 2017
  
  fa978dbe
- Merge remote-tracking branch 'ee/master' into ce-to-ee-2017-09-08 · 91d78fd2
  Lin Jen-Shin authored Sep 11, 2017
```
* ee/master:
  index project settings doc from other indexes
  copyedit
  fixes link
  Add a unique index on project_id to the Geo project_registry table
  Update K8s docs to match CE
  Merge branch 'docs-new-topic-projects-settings' into 'master'
  fix small typos in ldap.md
  add ce to ee instructions for 10.0
```
  91d78fd2
- Remove duplicated property · 6ad65d08
  Lin Jen-Shin authored Sep 11, 2017
  
  6ad65d08
- Fix the schema. We already removed those columns · 8a0ab1bc
  Lin Jen-Shin authored Sep 11, 2017
```
Bad resolution from https://gitlab.com/gitlab-org/gitlab-ee/commit/a58f22114d38fc98acfdf7e1d6bea85bc6f00df1
We need https://gitlab.com/gitlab-org/gitlab-ce/issues/37568
```
  8a0ab1bc
- Revert "Try to reset the migration properly" · f2e1848a
  Lin Jen-Shin authored Sep 11, 2017
```
This reverts commit 81d44ae4.
```
  f2e1848a
08 Sep, 2017 29 commits
- Restore missing column removed from: · 7ef2f99d
  Lin Jen-Shin authored Sep 09, 2017
```
a58f2211
```
  7ef2f99d
- Try to reset the migration properly · 81d44ae4
  Lin Jen-Shin authored Sep 09, 2017
  
  81d44ae4
- Merge branch 'docs-quick-fix-ee' into 'master' · d9f96cbc
  Achilleas Pipinellis authored Sep 08, 2017
```
Docs: quick fix - indexes project settings

See merge request !2873
```
  d9f96cbc
- restored some EE specific links in profile sidebar · bff4984d
  Phil Hughes authored Sep 08, 2017
  
  bff4984d
- Merge branch '3384-update-helm-chart-docs-from-ce-docs' into 'master' · 73b348a4
  Achilleas Pipinellis authored Sep 08, 2017
```
Update Helm Chart docs from CE - docs

Closes #3384

See merge request !2871
```
  73b348a4
- index project settings doc from other indexes · 581bbc43
  Marcia Ramos authored Sep 08, 2017
  
  581bbc43
- copyedit · 35185b32
  Marcia Ramos authored Sep 08, 2017
  
  35185b32
- fixes link · 9a3059ec
  Marcia Ramos authored Sep 08, 2017
  
  9a3059ec
- Merge branch '3354-add-unique-index-on-project-id-to-geo-project-registry-table' into 'master' · 04e305e3
  Nick Thomas authored Sep 08, 2017
```
Add a unique index on project_id to the Geo project_registry table

Closes #3354

See merge request !2850
```
  04e305e3
- Add a unique index on project_id to the Geo project_registry table · 149e7056
  Douglas Barbosa Alexandre authored Sep 08, 2017
  
  149e7056
- Update K8s docs to match CE · cdcc50dd
  Joshua Lambert authored Sep 08, 2017
  
  cdcc50dd
- Merge branch 'jk-update-10-0' into 'master' · c83f86d2
  Achilleas Pipinellis authored Sep 08, 2017
```
Add ce to ee instructions for 10.0

See merge request !2866
```
  c83f86d2
- Fix docs merge conflicts · bb0cf29b
  Achilleas Pipinellis authored Sep 08, 2017
  
  bb0cf29b
- Merge branch 'docs-project-settings' into 'master' · df35716b
  Marcia Ramos authored Sep 08, 2017
```
Docs new index for project's settings

See merge request !2870
```
  df35716b
- Merge branch 'fix/ldap-typo-docs' into 'master' · fe2a57c9
  Achilleas Pipinellis authored Sep 08, 2017
```
Fix small typos in LDAP documentation

See merge request !2867
```
  fe2a57c9
- Merge branch 'docs-new-topic-projects-settings' into 'master' · dc795886
  Achilleas Pipinellis authored Sep 08, 2017
```
Docs new index for project's settings

Closes #35719

See merge request !13552
```
  dc795886
- Fix problems with Gitlab::UrlSanitizer · e27dc776
  Nick Thomas authored Sep 08, 2017
  
  e27dc776
- Resolve app/services/ci/create_pipeline_service.rb · 6e31e1b8
  Lin Jen-Shin authored Sep 08, 2017
  
  6e31e1b8
- Fix conflicts resolution in workhorse/artifacts code · 168cb81c
  Grzegorz Bizon authored Sep 08, 2017
  
  168cb81c
- resolve conflicts in ldap user_spec · 74c8f493
  Jarka Kadlecova authored Sep 08, 2017
  
  74c8f493
- Resolve conflict in spec/requests/api/jobs_spec.rb · 43336b1d
  Rémy Coutable authored Sep 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  43336b1d
- Resolve conflict in lib/gitlab/workhorse.rb · 2de2fe53
  Rémy Coutable authored Sep 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2de2fe53
- Resolve conflict in lib/gitlab/url_sanitizer.rb · ea7f5a05
  Rémy Coutable authored Sep 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ea7f5a05
- Resolve conflict in doc/user/permissions.md · 47c09cfd
  Rémy Coutable authored Sep 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  47c09cfd
- Resolve conflict in app/controllers/admin/dashboard_controller.rb · 319cb063
  Rémy Coutable authored Sep 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  319cb063
- Fix incorrectly resolved conflicts in artifacts API · 753f2eb3
  Grzegorz Bizon authored Sep 08, 2017
  
  753f2eb3
- resolved haml conflicts · 64f1e7b8
  Phil Hughes authored Sep 08, 2017
```
[ci skip]
```
  64f1e7b8
- Merge branch 'ce-to-ee-2017-09-08' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-2017-09-08 · 1b228d63
  kushalpandya authored Sep 08, 2017
  
  1b228d63
- Resolve conflicts from projects dropdown · b910d9e5
  kushalpandya authored Sep 08, 2017
```
[ci skip]
```
  b910d9e5