1. 15 Jan, 2020 15 commits
    • Kushal Pandya's avatar
      Merge branch 'parent-child-upstream-downstream-labels' into 'master' · 152d1286
      Kushal Pandya authored
      Add child and parent labels to pipelines (3/3)
      
      See merge request gitlab-org/gitlab!21332
      152d1286
    • Payton Burdette's avatar
      Add child and parent labels · e7b2d546
      Payton Burdette authored
      Adds child/parent labels to either
      a parent pipeline or a child pipeline
      this is dependent on the data returned
      from the triggered or triggered_by array
      responses from the controller.
      
      Generate changelog entry for new feat
      
      Generate locale/gitlab.pot file
      
      Refactor child/parent labels
      
      BE proposed new data returned
      from the endpoint. I have to adjust FE
      to determine if a pipeline project id
      is the same as the linked pipelines project
      id. That will determine if the current pipeline
      is a child or a parent pipeline.
      
      Use scss variable instead of hard coded
      
      Use scss variable with a padding value
      of 4px instead of hard coding a padding
      value on a scss class.
      
      Fix eslint issues
      
      Fixed eslint issued for passing props
      without a dash. And had to disable next
      line of the mock data file for testing. I
      need the duplicate key.
      
      Refactor to determine label type
      
      Ran into issue where I was expecting
      a key value that will not exist had to
      come up with a workaround. String matches
      should be refactored, once BE supports the data
      return we need.
      
      Remove scss moving to another MR
      
      This MR isn't ready to be merged,
      so I'm moving this fix to another MR
      to get it user facing ASAP.
      
      Add tooltips for parent/child pipelines
      
      Added tooltips and tooltip text for
      a parent or child pipeline. Also when
      hovered over the label it hides tooltip
      for the pipeline so two aren't showing at
      the same time.
      
      Add dynamic class for child pipeline
      
      Needed more margin bottom for a child pipeline
      so the downstream pipelines would not overlap.
      Also fixed what tooltip text is returned for
      a label.
      
      Remove margin bottom on last child
      
      Make sure if a child pipeline is the
      last element in the column that the
      new margin bottom is removed.
      
      Add back fix for removing extra lines
      
      Should of let a merge conflict do this
      when my Other MR fixed a small UI bug.
      
      Refactor how margin top is calc
      
      For downstream pipelines, the current
      margin top calc will not work since the
      nodes now have extra info. Needed to adjust
      that and move some scss to new file.
      
      Refactor how margin top is calculated
      
      Since introducing new nodes of different
      sizes the old way of calculating margin
      top for downstream nodes will no longer work.
      I've introduced a new way to calculate how
      margin top is calculated.
      
      Refactor linked pipeline tests
      
      Had duplicate project ids in the mock
      data, fixed that. Also had to change the
      way we checked if an event was emitted due
      to now passing data with the event.
      
      Fix eslint and static analysis errors
      
      Needed to regenerate gitlab.pot and
      order attributes correctly in linked
      pipeline component.
      e7b2d546
    • Heinrich Lee Yu's avatar
      Merge branch '34564-delete-vulnerability-issue-link' into 'master' · 035c7ad7
      Heinrich Lee Yu authored
      Delete a Vulnerability-Issue link API call
      
      See merge request gitlab-org/gitlab!20545
      035c7ad7
    • Victor Zagorodny's avatar
      Add service to delete VulnerabilityIssueLinks · d3cf6188
      Victor Zagorodny authored
      Add service class w/ tests. Improve
      ServiceResponse class and
      vulnerabilities_issue_link factory for this.
      d3cf6188
    • Kushal Pandya's avatar
      Merge branch '195137-update-webpack-to-4.41.5' into 'master' · 5be39aac
      Kushal Pandya authored
      Update webpack from 4.40.2 to 4.41.5
      
      See merge request gitlab-org/gitlab!22452
      5be39aac
    • Kushal Pandya's avatar
      Merge branch 'mw-cr-mvc-search-store' into 'master' · 05e3a857
      Kushal Pandya authored
      Code Review Analytics: Add Vuex store to app
      
      See merge request gitlab-org/gitlab!22964
      05e3a857
    • Ray Paik's avatar
      Merge branch 'patch-57' into 'master' · be5cd8b9
      Ray Paik authored
      Remove double closing bracket in nginx.md
      
      See merge request gitlab-org/gitlab!23024
      be5cd8b9
    • Ray Paik's avatar
      Merge branch 'docs-junit_test_reports-typo' into 'master' · d7f528c8
      Ray Paik authored
      Docs: Fix typo in doc/ci/junit_test_reports.md
      
      See merge request gitlab-org/gitlab!22957
      d7f528c8
    • Ray Paik's avatar
      Merge branch 'patch-57' into 'master' · 1bd1db0e
      Ray Paik authored
      Fix minor grammatical errors
      
      See merge request gitlab-org/gitlab!23020
      1bd1db0e
    • Mike Greiling's avatar
      Merge branch 'ph/fixBatchDiffsDiscussionsNotShowing' into 'master' · 39bbbcae
      Mike Greiling authored
      Fixes issue where discussions would not be assigned with batch diffs
      
      See merge request gitlab-org/gitlab!22982
      39bbbcae
    • Russell Dickenson's avatar
      Merge branch 'add-rugged-puma-topic-to-puma-docs' into 'master' · c46cc334
      Russell Dickenson authored
      Rugged/Puma config section in Puma doc
      
      See merge request gitlab-org/gitlab!22472
      c46cc334
    • Qingyu Zhao's avatar
      Rugged/Puma config section in Puma doc · 982978a7
      Qingyu Zhao authored
      982978a7
    • jboyson1's avatar
      Fix karma tests · 82414aae
      jboyson1 authored
      Need notes.discussions to have a length for
      the code to work as intended.
      82414aae
    • Paul Slaughter's avatar
      Merge branch 'ss/add-milestone-and-assignee-to-wiplimits' into 'master' · ff32b924
      Paul Slaughter authored
      Add support for milestone and assignee
      
      See merge request gitlab-org/gitlab!23016
      ff32b924
    • Scott Stern's avatar
      Add support for milestone and assignee · f11779b1
      Scott Stern authored
      Add support for milestone and assignee
      when opening wip limits sidebar
      
      https://gitlab.com/gitlab-org/gitlab/merge_requests/23016
      f11779b1
  2. 14 Jan, 2020 25 commits