Commits · 880afe2246440739fa71fc80d6446679074fc325 · Boxiang Sun / gitlab-ce

06 Feb, 2019 15 commits
- Merge branch '30299-discussion-from-individual-note' into 'master' · 880afe22
  Phil Hughes authored Feb 06, 2019
```
Add reply to notes to turn into discussions

See merge request gitlab-org/gitlab-ce!24480
```
  880afe22
- Add reply to notes to turn into discussions · a04d9ba9
  Heinrich Lee Yu authored Feb 06, 2019
  
  a04d9ba9
- Merge branch 'winh-noteable_note_spec-vue-test-utils' into 'master' · c5f1b834
  Fatih Acet authored Feb 06, 2019
```
Convert noteable_note_spec.js to Vue test utils

See merge request gitlab-org/gitlab-ce!24801
```
  c5f1b834
- Merge branch 'knative-list' into 'master' · c7c5492c
  Phil Hughes authored Feb 06, 2019
```
Modify Serverless Listing

See merge request gitlab-org/gitlab-ce!24072
```
  c7c5492c
- Merge branch 'adriel-add-metrics-chart-tooltips' into 'master' · cef60443
  Phil Hughes authored Feb 06, 2019
```
Add metrics chart tooltips

See merge request gitlab-org/gitlab-ce!24651
```
  cef60443
- Merge branch 'create-svg-wrapper-css-class' into 'master' · 1c932a61
  Phil Hughes authored Feb 06, 2019
```
Add square css class

See merge request gitlab-org/gitlab-ce!24875
```
  1c932a61
- Merge branch '28500-empty-states-for-profile-page' into 'master' · 829a5a9e
  Fatih Acet authored Feb 06, 2019
```
Resolve "Empty states for profile page"

Closes #28500

See merge request gitlab-org/gitlab-ce!24549
```
  829a5a9e
- Resolve "Empty states for profile page" · 5c4d0589
  Dennis Tang authored Feb 06, 2019
  
  5c4d0589
- Merge branch '52568-external-mr-diffs' into 'master' · 591380a3
  Sean McGivern authored Feb 06, 2019
```
Allow merge request diffs to be placed into an object store

Closes #52568

See merge request gitlab-org/gitlab-ce!24276
```
  591380a3
- Modified Knative list view to provide more details · 17bae7c7
  Chris Baumbauer authored Jan 21, 2019
  
  17bae7c7
- Merge branch 'mysql_validate_pre_truncate' into 'master' · d0187de2
  Stan Hu authored Feb 06, 2019
```
Adds validation for schema_migration prior to truncate.

See merge request gitlab-org/gitlab-ce!6459
```
  d0187de2
- Merge branch 'chore/update-js-regex' into 'master' · ae55a99f
  Stan Hu authored Feb 06, 2019
```
update js_regex 2.2.1 -> 3.1

See merge request gitlab-org/gitlab-ce!24433
```
  ae55a99f
- Fix MySQL error when truncating a table that doesn't exist · 56c267e5
  Jose Torres authored Sep 21, 2016
```
This adds a conditional statement before truncating the
`schema_migrations` table.

This comit also ports this code to Rails 5.
```
  56c267e5
- Merge branch 'merge-dev-into-master' into 'master' · d8e24e9d
  Stan Hu authored Feb 06, 2019
```
Merge dev.gitlab.org master into GitLab.com master

Closes #54721, #56663, #2779, #2776, #2772, #2783, #2766, #2784, #2760, #2775, #2777, #2767, #2786, #2780, and #56860

See merge request gitlab-org/gitlab-ce!24935
```
  d8e24e9d
- Merge branch 'winh-note_app_spec-vue-test-utils' into 'master' · ea525bdb
  Fatih Acet authored Feb 06, 2019
```
Convert note_app_spec.js to Vue test utils

See merge request gitlab-org/gitlab-ce!24900
```
  ea525bdb
05 Feb, 2019 25 commits
- Merge branch 'gt-externalize-app-views-email_rejection_mailer' into 'master' · 71288141
  Filipa Lacerda authored Feb 05, 2019
```
Externalize strings from `/app/views/email_rejection_mailer`

See merge request gitlab-org/gitlab-ce!24869
```
  71288141
- Merge branch '54544-update-project-topics-styling-to-use-badges-design' into 'master' · 0975b9c4
  Fatih Acet authored Feb 05, 2019
```
Resolve "Update project topics styling to use badges design"

Closes #54544

See merge request gitlab-org/gitlab-ce!24415
```
  0975b9c4
- Resolve "Update project topics styling to use badges design" · 52434a70
  Brandon Labuschagne authored Feb 05, 2019
  
  52434a70
- Merge branch 'patch-29' into 'master' · db35914c
  Evan Read authored Feb 05, 2019
```
docs: improve OpenSSH installation on Windows options

See merge request gitlab-org/gitlab-ce!24206
```
  db35914c
- docs: improve OpenSSH installation on Windows options · 67e7a15e
  Ben Bodenmiller authored Feb 05, 2019
  
  67e7a15e
- Merge branch 'rd-update-last_activity_on-on-logins-and-browsing-activity-54947' into 'master' · a1566898
  Stan Hu authored Feb 05, 2019
```
Update User's last_activity_on for any GET request on projects

Closes #54947

See merge request gitlab-org/gitlab-ce!24642
```
  a1566898
- Resolve conflicts in spec/services/members/destroy_service_spec.rb · 93dc3499
  Stan Hu authored Feb 05, 2019
  
  93dc3499
- Resolve conflicts in spec/policies/personal_snippet_policy_spec.rb · 6b47a29a
  Stan Hu authored Feb 05, 2019
  
  6b47a29a
- Resolve conflicts in spec/lib/safe_zip/extract_spec.rb · 3acc82a8
  Stan Hu authored Feb 05, 2019
  
  3acc82a8
- Resolve conflicts in spec/features/markdown/math_spec.rb · a93c5bbc
  Stan Hu authored Feb 05, 2019
  
  a93c5bbc
- Resolve conflicts in app/policies/personal_snippet_policy.rb · 43d7fb13
  Stan Hu authored Feb 05, 2019
  
  43d7fb13
- Remove comment about needing cookie support · 5108ed98
  Stan Hu authored Feb 05, 2019
```
Cookies are no longer needed for this feature to work.
```
  5108ed98
- Merge branch 'use-deployment-relation-to-fetch-environment-ce' into 'master' · 07d137a9
  Stan Hu authored Feb 05, 2019
```
Backport: Optimize slow pipelines.js response

See merge request gitlab-org/gitlab-ce!24890
```
  07d137a9
- Add chart tooltips · 7d92f487
  Adriel Santiago authored Jan 23, 2019
```
Use tooltips for metrics graph data
```
  7d92f487
- Merge branch 'adriel-use-svg-icon-for-deployment-series' into 'master' · 91b1e9dc
  Phil Hughes authored Feb 05, 2019
```
Use SVG icon for deployment series

See merge request gitlab-org/gitlab-ce!24652
```
  91b1e9dc
- Merge branch 'jej/avoid-csrf-check-on-saml-failure' into 'master' · 8b02d58e
  Rémy Coutable authored Feb 05, 2019
```
Skip CSRF check on SAML failure endpoint

Closes #56574

See merge request gitlab-org/gitlab-ce!24509
```
  8b02d58e
- Resolve conflicts in config/routes/import.rb · 9a3b09ad
  Stan Hu authored Feb 05, 2019
  
  9a3b09ad
- Merge branch 'ce-reduce-diff-in-groups-update_service' into 'master' · 22caeb58
  Nick Thomas authored Feb 05, 2019
```
Reduce diff with EE in Groups::UpdateService

See merge request gitlab-org/gitlab-ce!24912
```
  22caeb58
- Merge branch 'ce-reduce-diff-in-ci-create_pipeline_service' into 'master' · 699806ba
  Nick Thomas authored Feb 05, 2019
```
Reduce the diff with EE in Ci::CreatePipelineService

See merge request gitlab-org/gitlab-ce!24831
```
  699806ba
- Merge branch 'docs-operations-index' into 'master' · ac3d30f2
  Achilleas Pipinellis authored Feb 05, 2019
```
Docs: add index for project operations

Closes #56115

See merge request gitlab-org/gitlab-ce!24565
```
  ac3d30f2
- Docs: add index for project operations · ef543044
  Marcia Ramos authored Feb 05, 2019
  
  ef543044
- Merge branch 'ce-reduce-diff-in-search-global_service' into 'master' · a14db4a2
  Douglas Barbosa Alexandre authored Feb 05, 2019
```
Reduce diff with EE in Search::GlobalService

See merge request gitlab-org/gitlab-ce!24914
```
  a14db4a2
- Merge branch 'mj/security-mr-template' into 'master' · e37abfbb
  Yorick Peterse authored Feb 05, 2019
```
Author is Developer in sec. release MR template

See merge request gitlab-org/gitlab-ce!24934
```
  e37abfbb
- Merge branch 'diff-file-finder' into 'master' · 3bed077c
  Filipa Lacerda authored Feb 05, 2019
```
Added fuzzy file finder to merge requests

Closes #53304

See merge request gitlab-org/gitlab-ce!24434
```
  3bed077c
- Resolve conflict in projects/issues_controller.rb · de3bfd28
  Brett Walker authored Feb 05, 2019
  
  de3bfd28