Commits · 69661e6dd3a6f8d31c965f4b595238e342791a35 · nexedi / gitlab-ce

22 Feb, 2018 3 commits
- Update EE spec after language change · 69661e6d
  Eric Eastwood authored Feb 22, 2018
  
  69661e6d
- Update enabled Kubernetes cluster button to "Kubernetes configured" · 592690c1
  Eric Eastwood authored Feb 22, 2018
```
See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_60175507
```
  592690c1
- Remove indent and reduce bloat with link_to_if · 392e7de7
  Eric Eastwood authored Feb 22, 2018
```
See

 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_60163789
 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_60164324
```
  392e7de7
21 Feb, 2018 14 commits
- Fix enabled filtering on stat anchors · 85bbdc8a
  Eric Eastwood authored Feb 21, 2018
  
  85bbdc8a
- Link "add a Kubernetes cluster" to new cluster page · 565d9fb3
  Eric Eastwood authored Feb 21, 2018
```
See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_59936315
```
  565d9fb3
- Make ruby-lint happy · cffde1d7
  Oswaldo Ferreira authored Feb 21, 2018
  
  cffde1d7
- Use method call instead hash accesses · 54281356
  Oswaldo Ferreira authored Feb 21, 2018
  
  54281356
- Move EE spec to follow ee-files-location-check · 5e828591
  Eric Eastwood authored Feb 20, 2018
```
See https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/53555644
```
  5e828591
- Memoize method which is called multiple times on presenter · ebfa37f9
  Oswaldo Ferreira authored Feb 20, 2018
  
  ebfa37f9
- Add unit tests to presenter methods · 87f1f6fc
  Oswaldo Ferreira authored Feb 20, 2018
  
  87f1f6fc
- Use OpenStruct instead Hash for statistics buttons · 1a2cd2cd
  Oswaldo Ferreira authored Feb 20, 2018
  
  1a2cd2cd
- Improve methods naming · 7cf32d1c
  Oswaldo Ferreira authored Feb 20, 2018
  
  7cf32d1c
- Move default_project_view tests to presenter · 0ae309f1
  Oswaldo Ferreira authored Feb 20, 2018
  
  0ae309f1
- Move button list logic to project presenter · 3a2fceb7
  Oswaldo Ferreira authored Feb 20, 2018
  
  3a2fceb7
- Switch back to using a single partial · c2680afd
  Eric Eastwood authored Feb 20, 2018
```
See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_59334967
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_59714883
```
  c2680afd
- Add EE specs for multiple clusters linking to list page · 551d29a5
  Eric Eastwood authored Feb 14, 2018
  
  551d29a5
- Add Auto DevOps and Kubernetes cluster button to project page · d459b050
  Eric Eastwood authored Feb 02, 2018
  
  d459b050
20 Feb, 2018 23 commits
- 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' · 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