1. 20 Jul, 2015 15 commits
  2. 19 Jul, 2015 6 commits
    • Sven Strickroth's avatar
    • Valery Sizov's avatar
      Merge branch 'rs-issue-2001' into 'master' · e72b110e78d8
      Valery Sizov authored
      Dynamically check `:admin_*` ability in issuable context
      
      Closes #2001
      
      See merge request !1002
      e72b110e78d8
    • Robert Speicher's avatar
      Dynamically check `:admin_*` ability in issuable context · c50e82f66a40
      Robert Speicher authored
      Closes #2001
      c50e82f66a40
    • Daniel Gerhardt's avatar
      Fix label read access for unauthenticated users · 281046be2bcf
      Daniel Gerhardt authored
      The label page was added to navigation for unauthorized users because
      the previously used milestone read permission was still checked. This
      has been fixed and read access to labels is now granted (again) for
      public projects.
      
      This regression has been introduced in
      143429f2aa4f (7.12).
      
      See also d253d1a1bc9b.
      
      Refs !836, !842.
      281046be2bcf
    • Valery Sizov's avatar
      Merge branch 'fix-mixed-color-preview' into 'master' · 2ef8ed828bc8
      Valery Sizov authored
      Fix bug where notes were being rendered with wrong color preferences due to caching
      
      ### What does this MR do?
      
      This MR adds the user's color preferences as part of the caching key for notes.
      
      ### Why was this MR needed?
      
      This should fix a bug introduced via 1774763d25e5 where notes were being loaded from the cache without regard to the current user's color scheme.
      
      ### What are the relevant issue numbers?
      
      Closes #2008
      
      See merge request !994
      2ef8ed828bc8
    • Stan Hu's avatar
      Merge branch 'fix-oauth-redirection' into 'master' · f5a8fdd2cdf5
      Stan Hu authored
      Fix OAuth provider bug where GitLab would not go return to the redirect_uri after sign-in
      
      ### What does this MR do?
      
      This MR fixes a bug when GitLab is used as an OAuth provider (e.g. to GitLab CI) where the user is not redirected back to the original URI after a successful sign-in. This MR tweaks the Doorkeeper configuration to set the `user_return_to` Devise session variable, as mentioned in this [Stack Overflow](http://stackoverflow.com/questions/14504739/how-to-use-both-devise-and-doorkeeper-gems) post.
      
      ### Why was this MR needed?
      
      If you attempt to "Login via GitLab" from GitLab CI and aren't logged out completely, GitLab asks for your username and password. After you login, you get directed to the GitLab dashboard instead of back to GitLab CI. It's easy to reproduce:
      
      1. Set up a GitLab CI and GitLab instance (e.g. ci.gitlab.com, gitlab.com).
      2. Start an Incognito Window so that you are logged out of GitLab CI and GitLab.
      3. Go to the GitLab CI instance. Click the "Login with GitLab".
      4. Enter in your credentials.
      5. Watch your browser login to GitLab and not return to GitLab CI.
      
      ### What are the relevant issue numbers?
      
      Closes #1612
      
      See merge request !998
      f5a8fdd2cdf5
  3. 18 Jul, 2015 11 commits
  4. 17 Jul, 2015 8 commits