Commits · 9c7dba128e266727fc9b195a89f600715e6e9acc · nexedi / gitlab-ce

20 Feb, 2018 40 commits
- Move EE changelog items to ee/changelogs/unreleased · 9c7dba12
  Rémy Coutable authored Feb 20, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9c7dba12
- Merge branch 'docs-comm-article-phoenix-app-gitlab-ci-ee' into 'master' · 70b61a3e
  Achilleas Pipinellis authored Feb 20, 2018
```
Docs: comm article Phoenix App with GitLab CI/CD

See merge request gitlab-org/gitlab-ee!4626
```
  70b61a3e
- Merge branch 'ce-to-ee-2018-02-20' into 'master' · 814300f2
  Marin Jankovski authored Feb 20, 2018
```
CE upstream - 2018-02-20 15:23 UTC

See merge request gitlab-org/gitlab-ee!4627
```
  814300f2
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-20 · 950e3045
  GitLab Bot authored Feb 20, 2018
  
  950e3045
- Merge branch 'docs-comm-article-phoenix-app-gitlab-ci' into 'master' · 0cb05260
  Marcia Ramos authored Feb 20, 2018
```
Docs: comm article Phoenix App with GitLab CI/CD

See merge request gitlab-org/gitlab-ce!16776
```
  0cb05260
- Merge branch 'docs-comm-article-phoenix-app-gitlab-ci' into 'master' · 07fc0ea7
  Marcia Ramos authored Feb 20, 2018
```
Docs: comm article Phoenix App with GitLab CI/CD

See merge request gitlab-org/gitlab-ce!16776
```
  07fc0ea7
- Docs: comm article Phoenix App with GitLab CI/CD · ad3025c3
  Marcia Ramos authored Feb 20, 2018
  
  ad3025c3
- Merge branch 'docs-pages-refactor-article-series' into 'master' · b876a52b
  Achilleas Pipinellis authored Feb 20, 2018
```
Docs: Pages - clean up articles

See merge request gitlab-org/gitlab-ce!17188
```
  b876a52b
- Docs: Pages - clean up articles · 4e469090
  Marcia Ramos authored Feb 20, 2018
  
  4e469090
- Merge branch 'docs-pages-refactor-article-series-ee' into 'master' · 9a98b41a
  Achilleas Pipinellis authored Feb 20, 2018
```
Docs: Pages - clean up articles

See merge request gitlab-org/gitlab-ee!4599
```
  9a98b41a
- Docs: Pages - clean up articles · 88096201
  Marcia Ramos authored Feb 20, 2018
  
  88096201
- Merge branch '43424-put_all_event_metrics_behind_feature_flags' into 'master' · 9e9039ce
  Douwe Maan authored Feb 20, 2018
```
Fix for sidekiq metrics set cardinality growing unbounded

Closes #43424

See merge request gitlab-org/gitlab-ce!17235
```
  9e9039ce
- Merge branch... · 7e83993d
  Achilleas Pipinellis authored Feb 20, 2018
```
Merge branch '43376-follow-up-from-docs-update-all-articles-with-the-new-layout-metadata-from-the-frontmatter' into 'master'

Resolve "Follow-up from "Docs: Update all articles with the new layout (metadata from the frontmatter)""

Closes #43376

See merge request gitlab-org/gitlab-ce!17214
```
  7e83993d
- Merge branch 'ce-to-ee-2018-02-20' into 'master' · 693164c0
  Rémy Coutable authored Feb 20, 2018
```
CE upstream - 2018-02-20 12:23 UTC

See merge request gitlab-org/gitlab-ee!4622
```
  693164c0
- Resolve conflict in webpack.config.js · f8451e64
  Rémy Coutable authored Feb 20, 2018
  
  f8451e64
- Delete network_graph.rb · 6f9fb5b8
  Rémy Coutable authored Feb 20, 2018
  
  6f9fb5b8
- Only use features for events · 50c9ba43
  Pawel Chojnacki authored Feb 20, 2018
  
  50c9ba43
- Merge branch 'docs/group-project-create' into 'master' · bbd9a2fd
  Marcia Ramos authored Feb 20, 2018
```
Refactor docs for creating projects under a group

See merge request gitlab-org/gitlab-ee!4617
```
  bbd9a2fd
- Merge branch 'docs/lfs-lock-ee' into 'master' · 785a29b0
  Marcia Ramos authored Feb 20, 2018
```
Add version which LFS lock was introduced

See merge request gitlab-org/gitlab-ee!4615
```
  785a29b0
- Merge branch 'docs/lfs-lock' into 'master' · 9985c367
  Marcia Ramos authored Feb 20, 2018
```
Add version which LFS lock was introduced

See merge request gitlab-org/gitlab-ce!17233
```
  9985c367
- Merge branch 'docs/performance-testing' into 'master' · 7cbb8999
  Marcia Ramos authored Feb 20, 2018
```
Update docs on browser performance testing

See merge request gitlab-org/gitlab-ee!4613
```
  7cbb8999
- Merge branch 'docs/sast-refactor' into 'master' · f7a5eef5
  Marcia Ramos authored Feb 20, 2018
```
Refactor the SAST docs

Closes #4954

See merge request gitlab-org/gitlab-ee!4611
```
  f7a5eef5
- Put all event metrics exposed to prometheus behind a feature flag · 93c0a168
  Pawel Chojnacki authored Feb 20, 2018
  
  93c0a168
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-20 · acb3af6d
  GitLab Bot authored Feb 20, 2018
```
# Conflicts:
#	config/webpack.config.js
#	features/steps/project/network_graph.rb

[ci skip]
```
  acb3af6d
- Merge branch 'move-ee-only-files-to-ee' into 'master' · d4e631df
  Sean McGivern authored Feb 20, 2018
```
Move more EE-specific to ee/

See merge request gitlab-org/gitlab-ee!4603
```
  d4e631df
- Merge branch 'check-ee-files-location-for-branches-on-dot-com' into 'master' · ece4d70e
  Sean McGivern authored Feb 20, 2018
```
Run ee-files-location-check only for branches on .com

See merge request gitlab-org/gitlab-ee!4619
```
  ece4d70e
- Merge branch 'ce-to-ee-2018-02-20' into 'master' · e423e00e
  Rémy Coutable authored Feb 20, 2018
```
CE upstream - 2018-02-20 08:16 UTC

Closes gitlab-ce#25201

See merge request gitlab-org/gitlab-ee!4612
```
  e423e00e
- Merge branch 'move-spintach-project-network-graph-to-rspec' into 'master' · 5048c8d5
  Rémy Coutable authored Feb 20, 2018
```
Move spinach project network graph tests to RSpec

See merge request gitlab-org/gitlab-ce!17171
```
  5048c8d5
- Fix conflict in config/webpack.config.js · 3d7bbfef
  Rémy Coutable authored Feb 20, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3d7bbfef
- Fix conflict in app/views/shared/issuable/_sidebar.html.haml · a74be704
  Rémy Coutable authored Feb 20, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a74be704
- Fix conflict in app/views/projects/settings/repository/show.html.haml · 988467ea
  Rémy Coutable authored Feb 20, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  988467ea
- Merge branch 'remove-unnecessary-validate-project' into 'master' · 7f5d984d
  Kamil Trzciński authored Feb 20, 2018
```
Remove unecessary validate: true from belongs_to :project

See merge request gitlab-org/gitlab-ce!17166
```
  7f5d984d
- Refactor docs for creating projects under a group · 7f6621aa
  Achilleas Pipinellis authored Feb 20, 2018
  
  7f6621aa
- Run ee-files-location-check only for branches on .com · fc956709
  Rémy Coutable authored Feb 20, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fc956709
- Use relative URL for SAST docs · 4dff74e7
  Achilleas Pipinellis authored Feb 20, 2018
  
  4dff74e7
- Improve SAST_CONFIDENCE_LEVEL description · 7c9536aa
  Olivier Gonzalez authored Feb 16, 2018
  
  7c9536aa
- Fix sast documentation and example. Fix #4954 · 5fc42fb8
  Olivier Gonzalez authored Feb 15, 2018
  
  5fc42fb8
- Add version which LFS lock was introduced · e9eb9b07
  Achilleas Pipinellis authored Feb 20, 2018
  
  e9eb9b07
- Add version which LFS lock was introduced · fff70a04
  Achilleas Pipinellis authored Feb 20, 2018
  
  fff70a04
- Remove one artifact restriction for DAST, SAST in docs · 08bfd326
  Achilleas Pipinellis authored Feb 20, 2018
```
Fixed by
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4203
```
  08bfd326