Commits · c71c1f03c78cb3362bbe2baaf49a8e3573c96d1a · nexedi / gitlab-ce

30 Oct, 2018 8 commits
- Merge branch 'qa-filter-comments-in-issues' into 'master' · c71c1f03
  Grzegorz Bizon authored Oct 30, 2018
```
Adding tests for filtering activities/comments in issues

Closes #51889

See merge request gitlab-org/gitlab-ce!22564
```
  c71c1f03
- Adding tests for filtering activities/comments in issues · 75847b55
  Ramya Authappan authored Oct 30, 2018
  
  75847b55
- Merge remote-tracking branch 'origin/master' into dev-master · d0b746d8
  Jan Provaznik authored Oct 30, 2018
  
  d0b746d8
- Merge branch 'bw-fix-spec-in-merge' into 'master' · 5a953741
  Stan Hu authored Oct 30, 2018
```
Fix problem with spec that showed up in EE merge

See merge request gitlab-org/gitlab-ce!22675
```
  5a953741
- Merge branch 'docs-add_deprecation_notice_for_renamed_licensed_feature-ce' into 'master' · 67d97e3b
  Evan Read authored Oct 30, 2018
```
docs: Add deprecation notice for renamed licensed feature

See merge request gitlab-org/gitlab-ce!22575
```
  67d97e3b
- Fix problem with spec that showed up in EE merge · c11cb0b3
  Brett Walker authored Oct 29, 2018
  
  c11cb0b3
- Merge branch 'patch-31' into 'master' · af80955b
  Evan Read authored Oct 30, 2018
```
Added a note about machine types

See merge request gitlab-org/gitlab-ce!22572
```
  af80955b
- Added a note about machine types · 1c53a0fc
  Mark Veenstra authored Oct 30, 2018
  
  1c53a0fc
29 Oct, 2018 32 commits
- Merge branch 'update-gitlab-ui' into 'master' · acb8dc09
  Mike Greiling authored Oct 29, 2018
```
Update gitlab-ui to 1.9.0

See merge request gitlab-org/gitlab-ce!22632
```
  acb8dc09
- Update gitlab-ui to 1.9.0 · df587c15
  Clement Ho authored Oct 29, 2018
  
  df587c15
- Merge branch '53270-remove-mousetrap-rails' into 'master' · be46fb7e
  Mike Greiling authored Oct 29, 2018
```
Remove mousetrap-rails gem

Closes #53270

See merge request gitlab-org/gitlab-ce!22647
```
  be46fb7e
- Merge remote-tracking branch 'origin/master' into dev-master · 06b6daac
  DJ Mountney authored Oct 29, 2018
  
  06b6daac
- Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master' · 45b61a9e
  Douwe Maan authored Oct 29, 2018
```
Make new merge request URL more friendly when pushing code

Closes #53012

See merge request gitlab-org/gitlab-ce!22526
```
  45b61a9e
- Merge branch 'ml-qa-push-private-token' into 'master' · e4e40b96
  Dan Davison authored Oct 29, 2018
```
Add e2e test to push using a private token

See merge request gitlab-org/gitlab-ce!22628
```
  e4e40b96
- Merge branch '53273-update-moment-to-2-22-2' into 'master' · f1f8548f
  Mike Greiling authored Oct 29, 2018
```
Update moment to 2.22.2

Closes #53273

See merge request gitlab-org/gitlab-ce!22648
```
  f1f8548f
- Merge branch 'pages-1-3-0' into 'master' · 44a6b8d4
  Robert Speicher authored Oct 29, 2018
```
Update GitLab Pages to v1.3.0

See merge request gitlab-org/gitlab-ce!22666
```
  44a6b8d4
- Merge branch 'rails5-deprecated-uniq' into 'master' · 6c5154b5
  Robert Speicher authored Oct 29, 2018
```
Replace deprecated uniq on a Relation with distinct

See merge request gitlab-org/gitlab-ce!22625
```
  6c5154b5
- Merge branch '5979_rename_sast_container_gitlab_features-ce' into 'master' · 684ba98b
  Kamil Trzciński authored Oct 29, 2018
```
Rename 'sast_container' licensed feature

See merge request gitlab-org/gitlab-ce!22662
```
  684ba98b
- Merge branch 'sh-bump-whitequark-parser' into 'master' · 54bb7ad4
  Robert Speicher authored Oct 29, 2018
```
Upgrade whitequark/parser to 2.5.3.0

See merge request gitlab-org/gitlab-ce!22652
```
  54bb7ad4
- Merge branch 'winh-delete-job-spec' into 'master' · 6e743299
  Filipa Lacerda authored Oct 29, 2018
```
Delete job_spec.js

See merge request gitlab-org/gitlab-ce!22664
```
  6e743299
- Add e2e test to push using a private token · abf3a2d2
  Mark Lapierre authored Oct 26, 2018
```
Tests pushing over HTTP(S) using a personal access token
```
  abf3a2d2
- Update GitLab Pages to v1.3.0 · f5e081a3
  Nick Thomas authored Oct 29, 2018
  
  f5e081a3
- Merge branch 'gt-truncate-milestone-title-on-collapsed-sidebar' into 'master' · 48e61c6c
  Clement Ho authored Oct 29, 2018
```
Truncate milestone title on collapsed sidebar

See merge request gitlab-org/gitlab-ce!22624
```
  48e61c6c
- Delete job_spec.js · 38a4a8bf
  Winnie Hellmann authored Oct 29, 2018
  
  38a4a8bf
- Merge branch 'fix_pat_auth-11-4' into 'security-11-4' · c847f172
  Robert Speicher authored Oct 26, 2018
```
[11.4] Fix Token lookup for Git over HTTP and registry authentication

See merge request gitlab/gitlabhq!2577
```
  c847f172
- Merge branch '52122-fix-broken-whitespace-button' into 'master' · 05af98bf
  Phil Hughes authored Oct 29, 2018
```
Fix broken "Show whitespace changes" button on MR "Changes" tab

Closes #52122

See merge request gitlab-org/gitlab-ce!22539
```
  05af98bf
- Fix broken "Show whitespace changes" button on MR "Changes" tab · 4508343d
  Jacques Erasmus authored Oct 29, 2018
  
  4508343d
- Merge branch 'security-2717-fix-issue-title-xss' into 'master' · 5091cc4f
  Jan Provaznik authored Oct 29, 2018
```
[master] Escape issue title while template rendering to prevent XSS

See merge request gitlab/gitlabhq!2556
```
  5091cc4f
- Merge branch 'security-redact-links' into 'master' · 5b0b73d9
  Jan Provaznik authored Oct 29, 2018
```
[master] Redact unsubscribe links in issuable texts

See merge request gitlab/gitlabhq!2528
```
  5b0b73d9
- Merge branch 'fix/control-headers' into 'master' · f0b3edf2
  Jan Provaznik authored Oct 29, 2018
```
[master] Resolve "Sensitive information is stored in browser history"

See merge request gitlab/gitlabhq!2555
```
  f0b3edf2
- Merge branch 'sh-fix-wiki-security-issue-53072' into 'master' · d3cd569b
  Jan Provaznik authored Oct 29, 2018
```
[master] Validate Wiki attachments are valid temporary files

See merge request gitlab/gitlabhq!2568
```
  d3cd569b
- Merge branch 'security-master-junit-test-report-exposes-stacktrace' into 'master' · 58646c65
  Jan Provaznik authored Oct 29, 2018
```
[master] JUnit test reports endpoint exposes full stack trace in production mode

See merge request gitlab/gitlabhq!2559
```
  58646c65
- Merge branch 'security-if-51113-hash_tokens' into 'master' · f68037ea
  Jan Provaznik authored Oct 29, 2018
```
[master] Persist only SHA digest of PersonalAccessToken#token

See merge request gitlab/gitlabhq!2498
```
  f68037ea
- [master] Persist only SHA digest of PersonalAccessToken#token · b9652d8e
  Imre Farkas authored Oct 29, 2018
  
  b9652d8e
- Merge branch 'security-51527-xss-in-mr-source-branch' into 'master' · b5ca4ea1
  Jan Provaznik authored Oct 29, 2018
```
[master] Fix XSS in MR source branch name

See merge request gitlab/gitlabhq!2544
```
  b5ca4ea1
- Merge branch 'sh-fix-hipchat-ssrf' into 'master' · 107351e0
  Jan Provaznik authored Oct 29, 2018
```
[master] Prevent SSRF attacks in HipChat integration

See merge request gitlab/gitlabhq!2530
```
  107351e0
- Merge branch '45669-table-in-jobs-on-pipeline' into 'master' · 3d4cff1c
  Nick Thomas authored Oct 29, 2018
```
Remove all tables from Pipeline page when there is no job for the Pipeline

Closes #45669

See merge request gitlab-org/gitlab-ce!18540
```
  3d4cff1c
- Remove all tables from Pipeline page when there is no job for the Pipeline · 1c4eedd5
  Takuya Noguchi authored Oct 29, 2018
  
  1c4eedd5
- Rename 'sast_container' licensed feature · 0acdd3d3
  Kamil Trzciński authored Oct 23, 2018
  
  0acdd3d3
- Merge branch 'extract-ee-specific-lines-for-issues-and-mr-controllers' into 'master' · 43463869
  Nick Thomas authored Oct 29, 2018
```
Extract ee specific lines for issues and mr controllers

See merge request gitlab-org/gitlab-ce!22569
```
  43463869