1. 10 Nov, 2019 3 commits
    • Thong Kuah's avatar
      Merge branch 'bvl-single-diff-type' into 'master' · 6bb277fc
      Thong Kuah authored
      Only expose 1 diff style in diffs endpoint
      
      See merge request gitlab-org/gitlab!19317
      6bb277fc
    • Bob Van Landuyt's avatar
      Only expose 1 diff style in diffs endpoint · d4afb16d
      Bob Van Landuyt authored
      When enabling the `single_mr_diff_view` feature flag, the backend will
      only render one kind of diff: inline or parallel. The feature is
      disabled for now until the frontend has been updated.
      
      To switch the view, the frontend can pass a `view` param containing
      either `inline` or `parallel`. That will get written to a cookie. The
      response for diff files will then contain either
      `highlighted_diff_lines` or `parallel_diff_lines` but no longer both.
      d4afb16d
    • Michael Kozono's avatar
      Merge branch 'sh-update-openid-connect' into 'master' · b614399e
      Michael Kozono authored
      Update omniauth_openid_connect to v0.3.3
      
      See merge request gitlab-org/gitlab!19525
      b614399e
  2. 09 Nov, 2019 4 commits
  3. 08 Nov, 2019 33 commits