1. 28 Sep, 2016 4 commits
  2. 19 Sep, 2016 1 commit
    • Rémy Coutable's avatar
      Merge branch '18302-use-rails-cookie-in-api' into 'master' · d14c8b16
      Rémy Coutable authored
      Allow the Rails cookie to be used for API authentication
      
      Makes the Rails cookie into a valid authentication token for the Grape
      API, and uses it instead of token authentication in frontend code that
      uses the API.
      
      Rendering the private token into client-side javascript is a security
      risk; it may be stolen through XSS or other attacks. In general,
      re-using API code in the frontend is more desirable than implementing
      endless actions that return JSON.
      
      Closes #18302
      
      See merge request !1995
      Signed-off-by: Rémy Coutable's avatarRémy Coutable <remy@rymai.me>
      d14c8b16
  3. 14 Sep, 2016 1 commit
  4. 19 Aug, 2016 1 commit
  5. 16 Aug, 2016 2 commits
  6. 11 Jul, 2016 1 commit
  7. 10 Jul, 2016 3 commits
  8. 06 Jul, 2016 13 commits
  9. 30 Jun, 2016 12 commits
    • Jacob Schatz's avatar
      Merge branch 'sidebar-breakpoint' into 'master' · 8cbbcee3
      Jacob Schatz authored
      Updated breakpoint for sidebar pinning
      
      Updates the breakpoint for sidebar pinning to 1024px.
      
      Think we will have the same issue as before when picking into stable with `$window` not being defined.
      
      See merge request !5019
      (cherry picked from commit c5d164d1)
      8cbbcee3
    • Jacob Schatz's avatar
      Merge branch 'pin-nav-cookie-expiry' into 'master' · 10a17ade
      Jacob Schatz authored
      Expiry date on pinned nav cookie
      
      Adds an expiry date far into the future for the pinned nav cookie so that it survives logout & browser closing.
      
      See merge request !5009
      (cherry picked from commit 73196fbd)
      10a17ade
    • Robert Speicher's avatar
      Merge branch 'fix-external-issue-rendering' into 'master' · e2692686
      Robert Speicher authored
      Handle external issues in IssueReferenceFilter
      
      Rendering issue references such as `#1` was broken for projects using an external issues tracker.
      
      See gitlab-org/gitlab-ce#19036
      
      See merge request !4988
      (cherry picked from commit 6e82c0e0)
      e2692686
    • Rémy Coutable's avatar
      Merge branch 'fix_restore_warning' into 'master' · a700bc4c
      Rémy Coutable authored
      Fix restore warning message
      
      ## What does this MR do?
      
      Fix the restore Rake task so it properly outputs the database warning. This is a pretty important warning and it was not even being output. After this fix, the output looks like the screenshot below.
      
      ![Screen_Shot_2016-06-28_at_3.53.46_PM](/uploads/d250189d39fcacd0c8ec0aacf9cd930d/Screen_Shot_2016-06-28_at_3.53.46_PM.png)
      
      See merge request !4980
      (cherry picked from commit 0144dce7)
      a700bc4c
    • Robert Speicher's avatar
      Merge branch 'fix/build-retry-button-in-view' into 'master' · ce8db128
      Robert Speicher authored
      Do not show build retry link when build is active
      
      Closes #19244
      
      See merge request !4967
      (cherry picked from commit dc2d0051)
      ce8db128
    • Fatih Acet's avatar
      Merge branch 'commit-avatar-alignment' into 'master' · 04c2c88b
      Fatih Acet authored
      Fixed comit avatar alignment
      
      ## What does this MR do?
      
      Fixes the alignment of the avatar on https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG
      
      Also fixes potential issues in other places.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-27_at_10.58.26](/uploads/fa4f50cfc30a870422d1afa63a4331d1/Screen_Shot_2016-06-27_at_10.58.26.png)![Screen_Shot_2016-06-27_at_10.58.35](/uploads/bd7dc3cf77464c1775fabb45b8079f02/Screen_Shot_2016-06-27_at_10.58.35.png)
      
      See merge request !4933
      (cherry picked from commit 8cada02d)
      04c2c88b
    • Jacob Schatz's avatar
      Merge branch 'label-filter-path-fix' into 'master' · eb7356a4
      Jacob Schatz authored
      Fixed URL on label button when filtering
      
      ## What does this MR do?
      
      Gives the filtered labels the correct URL. Previously they tried to link to `labels#show` whereas now it links to the correct filter path.
      
      ## What are the relevant issue numbers?
      
      Closes #19005
      
      See merge request !4897
      (cherry picked from commit d3d9df5a)
      eb7356a4
    • Fatih Acet's avatar
      Merge branch 'fix_filebrowser_reload' into 'master' · aae44444
      Fatih Acet authored
      File Browser navigation fixes
      
      Fixes a double request being made when clicking the file name when navigating through file browser and also fixes opening a file in a new tab or when doing ctrl + click.
      
      Closes #19050
      
      **Before**
      
      ![navigation-old](/uploads/f9a40c91e430e31beae3a896cffb1c68/navigation-old.gif)
      
      **After**
      
      ![navigation](/uploads/dec9b43894c00cc09d80d19c83506530/navigation.gif)
      
      See merge request !4891
      (cherry picked from commit b32a6add)
      aae44444
    • Dmitriy Zaporozhets's avatar
      Merge branch '19003-file-view-subnav' into 'master' · d3b28207
      Dmitriy Zaporozhets authored
      Resolve "Sub nav isn't showing on file view"
      
      ## What does this MR do?
      Adds subnav to `Repository` > `File` view
      
      ## What are the relevant issue numbers?
      Closes #19003
      Part of #18844
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-06-23_at_5.33.05_PM](/uploads/aa6993b2376dbe454af87d852aa74f5e/Screen_Shot_2016-06-23_at_5.33.05_PM.png)
      
      cc @dzaporozhets
      
      See merge request !4890
      (cherry picked from commit 2efee5f6)
      d3b28207
    • Jacob Schatz's avatar
      Merge branch 'search-input-blur' into 'master' · 966eedd3
      Jacob Schatz authored
      Fixed search field blur not removing focus
      
      ## What does this MR do?
      
      Adds a blur event to remove focus styling from the search input.
      
      Any particular reason we were looking for clicks on the document? I can't see why we would be.
      
      ## What are the relevant issue numbers?
      
      Closes #18670
      
      ## Screenshots (if relevant)
      
      ![tab](/uploads/4c74d4f76ec7b45bfcf581606d2defb5/tab.gif)
      
      See merge request !4704
      (cherry picked from commit c051630a)
      966eedd3
    • Douwe Maan's avatar
      Merge branch '18033-private-repo-mentions' into 'master' · 70fd0177
      Douwe Maan authored
      Ensure logged-out users can't see private refs
      
      https://gitlab.com/gitlab-org/gitlab-ce/issues/18033
      
      I'm still not sure what to do about the CHANGELOG on security issues - should I add to a patch release? This issue was assigned to 8.10.
      
      See merge request !1974
      (cherry picked from commit 3a6ebb1f)
      70fd0177
    • Douwe Maan's avatar
      Merge branch '19312-confidential-issue' into 'master' · ad421b3a
      Douwe Maan authored
      Fix privilege escalation issue with OAuth external users
      
      Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/19312
      
      This MR fixes a privilege escalation issue, where manually set external users would be reverted back to internal users if they logged in via OAuth and that provider was not in the `external_providers` list.
      
      /cc @douwe
      
      See merge request !1975
      (cherry picked from commit 5e6342b7)
      ad421b3a
  10. 29 Jun, 2016 2 commits