Commits · e6cf25fa77dee54588158e48ee15ed583b1419e9 · nexedi / gitlab-ce

21 Feb, 2018 40 commits
- Resolve conflict in .gitlab-ci.yml · e6cf25fa
  Rémy Coutable authored Feb 21, 2018
  
  e6cf25fa
- Resolve conflict for spec/javascripts/pipelines/pipeline_details_mediator_spec.js · fd3cf20c
  Filipa Lacerda authored Feb 21, 2018
  
  fd3cf20c
- Resolve conflict for app/views/projects/pipelines/_with_tabs.html.haml · a3fe4a92
  Filipa Lacerda authored Feb 21, 2018
  
  a3fe4a92
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-21 · 12e3838c
  GitLab Bot authored Feb 21, 2018
```
# Conflicts:
#	.gitlab-ci.yml
#	app/views/projects/pipelines/_with_tabs.html.haml
#	spec/javascripts/pipelines/pipeline_details_mediator_spec.js

[ci skip]
```
  12e3838c
- Merge branch 'improve-codequality-job' into 'master' · 09220278
  Grzegorz Bizon authored Feb 21, 2018
```
Merge branch 'improve-codequality-job' into 'master'

See merge request gitlab-org/gitlab-ce!17263
```
  09220278
- Merge branch 'kp-epics-doc-update' into 'master' · dd1c3920
  Achilleas Pipinellis authored Feb 21, 2018
```
Update documentation for Epics filtered search and Group Roadmap

See merge request gitlab-org/gitlab-ee!4501
```
  dd1c3920
- Update documentation for Epics filtered search and Group Roadmap · 5fdf7707
  Kushal Pandya authored Feb 21, 2018
  
  5fdf7707
- Merge branch 'ce-3776-ci-view-for-sast' into 'master' · 48b14555
  Phil Hughes authored Feb 21, 2018
```
CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18n

See merge request gitlab-org/gitlab-ce!17176
```
  48b14555
- Merge branch '3776-ci-view-for-sast' into 'master' · 72ee0b60
  Phil Hughes authored Feb 21, 2018
```
Resolve "CI view for SAST"

Closes #3776

See merge request gitlab-org/gitlab-ee!4505
```
  72ee0b60
- Merge branch 'ck-consul-disable-migrations-docs' into 'master' · 860536ff
  Marcia Ramos authored Feb 21, 2018
```
Add disable auto-migrate to consul server setup

See merge request gitlab-org/gitlab-ee!4577
```
  860536ff
- Merge branch 'rebalance-test-job-nodes-28-2' into 'master' · 4e3f7a56
  Rémy Coutable authored Feb 21, 2018
```
Reduce Spinach parallelization to 2 nodes and increase RSpec's to 28 nodes

See merge request gitlab-org/gitlab-ce!16713
```
  4e3f7a56
- Merge branch 'improve-codequality-job' into 'master' · 5ccd3bec
  Grzegorz Bizon authored Feb 21, 2018
```
Simplify the codequality job

See merge request gitlab-org/gitlab-ee!4602
```
  5ccd3bec
- Merge branch '41461-project-members-slow-due-to-sql' into 'master' · 6d2a5f04
  Yorick Peterse authored Feb 21, 2018
```
Simplify database queries in MembersFinder and improve performance for Projects::ProjectMembersController#index

Closes #41461

See merge request gitlab-org/gitlab-ce!17190
```
  6d2a5f04
- Merge branch '42877-snippets-dashboard-slow' into 'master' · cc3a3fbf
  Yorick Peterse authored Feb 21, 2018
```
Improve query performance for Dashboard::SnippetsController#index

Closes #42877

See merge request gitlab-org/gitlab-ce!17088
```
  cc3a3fbf
- Merge branch 'move-project-pages-to-rspec' into 'master' · 9ff91bc4
  Rémy Coutable authored Feb 21, 2018
```
Move project pages spinach tests to Rspec

See merge request gitlab-org/gitlab-ce!17256
```
  9ff91bc4
- Merge branch 'ce-to-ee-2018-02-21' into 'master' · 21a8bf41
  Marin Jankovski authored Feb 21, 2018
```
CE upstream - 2018-02-21 12:31 UTC

See merge request gitlab-org/gitlab-ee!4648
```
  21a8bf41
- Merge branch 'more-dispatcher-refactoring' into 'master' · 2f2f63a0
  Jacob Schatz authored Feb 21, 2018
```
More dispatcher refactoring

See merge request gitlab-org/gitlab-ce!17232
```
  2f2f63a0
- More readable SQL query. · b25319f9
  Andreas Brandl authored Feb 21, 2018
  
  b25319f9
- Merge branch 'docs-project-labels' into 'master' · 715b10bc
  Achilleas Pipinellis authored Feb 21, 2018
```
Update wording docs labels

See merge request gitlab-org/gitlab-ce!17248
```
  715b10bc
- Update wording docs labels · b4df2fba
  Victor Wu authored Feb 21, 2018
  
  b4df2fba
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-21 · b2b7820d
  GitLab Bot authored Feb 21, 2018
  
  b2b7820d
- Merge branch '4887-geo-improve-formatting-of-can-t-push-to-secondary-warning-message' into 'master' · eee43854
  Sean McGivern authored Feb 21, 2018
```
Resolve "Geo: Improve formatting of can't push to secondary warning message"

Closes #4887

See merge request gitlab-org/gitlab-ee!4616
```
  eee43854
- Merge branch 'query-counting-should-not-include-cached-queries' into 'master' · 561e00b2
  Yorick Peterse authored Feb 21, 2018
```
Do not count rails sql cache as queries in query limiting

See merge request gitlab-org/gitlab-ce!17253
```
  561e00b2
- Removes not needed path in _info.html.haml · d485fd99
  Filipa Lacerda authored Feb 21, 2018
  
  d485fd99
- Fix broken icon + prevent page reload · dfa76037
  Filipa Lacerda authored Feb 21, 2018
  
  dfa76037
- update a changelog · f180315c
  Valery Sizov authored Feb 20, 2018
  
  f180315c
- Geo: Improve formatting of can't push to secondary warning message · 3950599e
  Valery Sizov authored Feb 20, 2018
  
  3950599e
- Fix typo in error message · 7038b4d6
  Filipa Lacerda authored Feb 21, 2018
  
  7038b4d6
- Move project pages spinach tests to Rspec · 8f4c9e29
  Semyon Pupkov authored Feb 21, 2018
```
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
```
  8f4c9e29
- Merge branch '1090-add-admin-note-to-user-show-page' into 'master' · 94220238
  Sean McGivern authored Feb 21, 2018
```
Resolve "Add admin note to user show page"

Closes #1090

See merge request gitlab-org/gitlab-ee!4546
```
  94220238
- Merge branch 'improve-codequality-job' into 'master' · d68c106a
  Grzegorz Bizon authored Feb 21, 2018
```
Simplify the codequality job

See merge request gitlab-org/gitlab-ee!4602
```
  d68c106a
- Merge branch '4079-related-flakes' into 'master' · aba27e28
  Phil Hughes authored Feb 21, 2018
```
Resolve "Transient failure of related_issues_root_spec.js"

Closes #4079

See merge request gitlab-org/gitlab-ee!4568
```
  aba27e28
- Resolve "Transient failure of related_issues_root_spec.js" · 1f2870c3
  Simon Knox authored Feb 21, 2018
  
  1f2870c3
- Merge branch 'ce-to-ee-2018-02-21' into 'master' · 3ab12f71
  Rémy Coutable authored Feb 21, 2018
```
CE upstream - 2018-02-21 02:17 UTC

See merge request gitlab-org/gitlab-ee!4641
```
  3ab12f71
- Update codequality script · 35a89d51
  Grzegorz Bizon authored Feb 21, 2018
  
  35a89d51
- Resolve conflict in app/views/projects/merge_requests/show.html.haml · 1064e45f
  Rémy Coutable authored Feb 21, 2018
  
  1064e45f
- Resolve conflict in app/views/projects/issues/index.html.haml · 8eed1cde
  Rémy Coutable authored Feb 21, 2018
  
  8eed1cde
- Resolve conflict in init_filtered_search.js · 82714a9a
  Rémy Coutable authored Feb 21, 2018
  
  82714a9a
- Merge branch 'ide-command-palette-fix' into 'master' · 6c564f4a
  Tim Zallmann authored Feb 21, 2018
```
Fixed IDE command palette options being hidden

See merge request gitlab-org/gitlab-ee!4601
```
  6c564f4a
- Merge branch 'ide-without-perf-bar' into 'master' · fba3668d
  Tim Zallmann authored Feb 21, 2018
```
Fixed IDE positioning when performance bar is hidden

See merge request gitlab-org/gitlab-ee!4621
```
  fba3668d