Commits · 55f76ce8f6010458988ccbc99201f6b74d11e238 · nexedi / gitlab-ce

05 Mar, 2019 21 commits
- Revert "Merge branch 'winh-dequarantine-labels-autocomplete' into 'master'" · 55f76ce8
  Winnie Hellmann authored Mar 05, 2019
```
This reverts merge request !25542
```
  55f76ce8
- Merge branch 'merge-dev-to-master' into 'master' · 83cb7482
  John Jarvis authored Mar 05, 2019
```
Merge dev.gitlab.org master into GitLab.com master

Closes #2794, #2814, #2806, #2805, #2798, #2795, #2788, and #2787

See merge request gitlab-org/gitlab-ce!25746
```
  83cb7482
- Resolve conflicts in group policy · a24eabb1
  Małgorzata Ksionek authored Mar 05, 2019
  
  a24eabb1
- Merge branch 'feature/gb/add-serverless-cicd-template' into 'master' · 960101c2
  Grzegorz Bizon authored Mar 05, 2019
```
Simplify CI/CD configuration on serverless projects

Closes #57405

See merge request gitlab-org/gitlab-ce!25523
```
  960101c2
- Merge branch '49663-branch-to-mr-connection' into 'master' · 1caa760f
  Phil Hughes authored Mar 05, 2019
```
Link to the MR from current branch in Web IDE

Closes #49663

See merge request gitlab-org/gitlab-ce!25689
```
  1caa760f
- Merge branch '45305-ci-status-icon-mismatch-on-merge-requests-page-and-the-mr-itself' into 'master' · d317aaf7
  Grzegorz Bizon authored Mar 05, 2019
```
Resolve "CI status icon mismatch on Merge Requests page and the MR itself"

Closes #45305

See merge request gitlab-org/gitlab-ce!25407
```
  d317aaf7
- Merge branch 'qa-perf-testdata' into 'master' · 17a014fa
  Sanad Liaquat authored Mar 05, 2019
```
Script to generate Perf Testdata

Closes #58140

See merge request gitlab-org/gitlab-ce!25548
```
  17a014fa
- Script to generate Perf Testdata · 31469e18
  Ramya Authappan authored Mar 05, 2019
  
  31469e18
- Merge branch 'scope-css-visual' into 'master' · 1b713ce9
  Kushal Pandya authored Mar 05, 2019
```
Scope gitlab:ui:visual pipeline job to css only changes

Closes #58514

See merge request gitlab-org/gitlab-ce!25755
```
  1b713ce9
- Scope gitlab:ui:visual pipeline job to css only changes · 91805098
  Clement Ho authored Mar 05, 2019
  
  91805098
- Merge branch 'rename-ambiguous-association-name-in-pipeline' into 'master' · 154720ca
  Kamil Trzciński authored Mar 05, 2019
```
Rename ambiguous association names in Ci::Pipeline

See merge request gitlab-org/gitlab-ce!25672
```
  154720ca
- Add frozen_string_literal to new files · ad2f711a
  Stan Hu authored Mar 04, 2019
  
  ad2f711a
- Merge branch 'gitlab-ui-visual' into 'master' · 34293b5a
  Kushal Pandya authored Mar 05, 2019
```
Add gitlab ui visual test

See merge request gitlab-org/gitlab-ce!24255
```
  34293b5a
- Add gitlab ui visual test · 211ae9d0
  Clement Ho authored Mar 05, 2019
  
  211ae9d0
- Resolve conflicts in spec/policies/group_policy_spec.rb · b9fcefc8
  Stan Hu authored Mar 04, 2019
  
  b9fcefc8
- Resolve conflicts in spec/mailers/notify_spec.rb · 997290fc
  Stan Hu authored Mar 04, 2019
  
  997290fc
- Resolve conflicts in app/policies/group_policy.rb · 0fc51747
  Stan Hu authored Mar 04, 2019
  
  0fc51747
- Merge branch 'docs-update-health-check' into 'master' · fdcfae2a
  Evan Read authored Mar 05, 2019
```
Update Health Check typo & adjust formatting

See merge request gitlab-org/gitlab-ce!25722
```
  fdcfae2a
- Merge branch 'patch-47' into 'master' · 3868a97f
  Evan Read authored Mar 05, 2019
```
docs: ldap users must have email address set

Closes #40071

See merge request gitlab-org/gitlab-ce!25691
```
  3868a97f
- docs: ldap users must have email address set · 999a20dc
  Moritz Bellach authored Mar 05, 2019
  
  999a20dc
- Rename ambiguous association names in Ci::Pipeline · 18889696
  Shinya Maeda authored Mar 01, 2019
```
fix it ok

Fix

head pipeline
```
  18889696
04 Mar, 2019 19 commits
- Merge branch 'expose-additional-merge-request-pipeline-variables' into 'master' · 7b4130d0
  Kamil Trzciński authored Mar 04, 2019
```
Expose additional merge request pipeline variables

See merge request gitlab-org/gitlab-ce!24595
```
  7b4130d0
- Merge branch 'master' into expose-additional-merge-request-pipeline-variables · 2b0a0f9b
  Hiroyuki Sato authored Mar 04, 2019
```
Conflicts:
  doc/ci/variables/README.md
  spec/models/ci/pipeline_spec.rb
```
  2b0a0f9b
- Merge branch 'gokhanap-master-patch-03762' into 'master' · afbb74f8
  Annabel Dunstone Gray authored Mar 04, 2019
```
commit page info-well overflow fix #56436

Closes #56436

See merge request gitlab-org/gitlab-ce!24799
```
  afbb74f8
- Fix commit page info well from overflowing container in side-by-side mode · 17ff3eaa
  Gokhan Apaydin authored Mar 04, 2019
  
  17ff3eaa
- Merge dev master into GitLab.com master · 59db98a0
  Yorick Peterse authored Mar 04, 2019
  
  59db98a0
- Merge branch 'security-2773-milestones-fix' into 'master' · 02501504
  Yorick Peterse authored Mar 04, 2019
```
[master] Check issue milestone availability

See merge request gitlab/gitlabhq!2788
```
  02501504
- Merge branch 'security-commit-private-related-mr' into 'master' · 6683298f
  Yorick Peterse authored Mar 04, 2019
```
Don't allow non-members to see private related MRs

Closes #2787

See merge request gitlab/gitlabhq!2866
```
  6683298f
- Merge branch 'security-id-restricted-access-to-private-repo' into 'master' · a43fd6ac
  Yorick Peterse authored Mar 04, 2019
```
Forbid creating discussions for users with restricted access

Closes #2788

See merge request gitlab/gitlabhq!2868
```
  a43fd6ac
- Forbid creating discussions for users with restricted access · 5169dafc
  Igor Drozdov authored Mar 04, 2019
  
  5169dafc
- Merge branch 'security-protect-private-repo-information' into 'master' · 9faf957b
  Yorick Peterse authored Mar 04, 2019
```
Fix leaking private repository information in API

See merge request gitlab/gitlabhq!2881
```
  9faf957b
- Merge branch 'security-tags-oracle' into 'master' · d8b4e585
  Yorick Peterse authored Mar 04, 2019
```
Prevent Releases links API to leak tag existence

Closes #2795

See merge request gitlab/gitlabhq!2893
```
  d8b4e585
- Merge branch 'security-2798-fix-boards-policy' into 'master' · 9d9591f4
  Yorick Peterse authored Mar 04, 2019
```
Disable issue board policies when issues are disabled

Closes #2798

See merge request gitlab/gitlabhq!2894
```
  9d9591f4
- Merge branch 'security-2797-milestone-mrs' into 'master' · 9803962d
  Yorick Peterse authored Mar 04, 2019
```
Show only MRs visible to user on milestone detail

See merge request gitlab/gitlabhq!2895
```
  9803962d
- Merge branch 'security-shared-project-private-group' into 'master' · e7bf6d07
  Yorick Peterse authored Mar 04, 2019
```
Sharing a public project with a private group makes the group page publicly accessible

See merge request gitlab/gitlabhq!2896
```
  e7bf6d07
- Merge branch... · b50ad884
  Yorick Peterse authored Mar 04, 2019
```
Merge branch '2802-security-add-public-internal-groups-as-members-to-your-project-idor' into 'master'

Add public/internal groups as members to your Project(IDOR)

See merge request gitlab/gitlabhq!2898
```
  b50ad884
- Merge branch 'security-kubernetes-local-ssrf' into 'master' · 03340f09
  Yorick Peterse authored Mar 04, 2019
```
Block local URLs for Kubernetes integration

See merge request gitlab/gitlabhq!2901
```
  03340f09
- Merge branch 'security-kubernetes-google-login-csrf' into 'master' · 6412a3e0
  Yorick Peterse authored Mar 04, 2019
```
Validate session key when authorizing with GCP to create a cluster

Closes #2805

See merge request gitlab/gitlabhq!2902
```
  6412a3e0
- Merge branch 'security-56348' into 'master' · 9e4a9cda
  Yorick Peterse authored Mar 04, 2019
```
Check snippet attached file to be moved is within designated directory

Closes #2806

See merge request gitlab/gitlabhq!2903
```
  9e4a9cda
- Merge branch 'security-55468-check-validity-before-querying' into 'master' · fa2f136f
  Yorick Peterse authored Mar 04, 2019
```
Fix blind SSRF in Prometheus Integration

See merge request gitlab/gitlabhq!2907
```
  fa2f136f