1. 22 Jun, 2015 26 commits
  2. 21 Jun, 2015 1 commit
  3. 20 Jun, 2015 7 commits
    • stanhu's avatar
      Merge pull request #9401 from strand/patch-2 · 1f3b6ef3
      stanhu authored
      Update Code of Conduct to Contributor Covenant 1.1.0
      1f3b6ef3
    • Douwe Maan's avatar
    • Douwe Maan's avatar
      Merge branch 'snippet_optional_filename' into 'master' · c0df5ff1
      Douwe Maan authored
      Make snippet filename optional.
      
      Fixes #2384.
      
      See merge request !1866
      c0df5ff1
    • Douwe Maan's avatar
      Merge branch 'new-mr-disable-change-target-branch' into 'master' · 07956981
      Douwe Maan authored
      Disable changing of target branch in new merge request page when a branch has already been specified
      
      ### What does this MR do?
      
      This MR prevents a user from changing the target branch inside a new merge request page if the target branch has already been specified (e.g. from the shortcut in the activity feed). A link to "Change branches" is provided to allow the user to do this properly.
      
      ### Why was this MR needed?
      
      If a user attempted to create a merge request from a shortcut with a pre-specified target branch (e.g. `master`), the dropdown would suggest that the user could change the branch. However, this did not actually work due to duplicate data elements (see #1830 for more details), and the target branch would always be set to the original, default branch. This would lead to confusion, potentially causing an improper merge request to be created.
      
      ### What are the relevant issue numbers?
      
      Closes #1830
      
      ### Screenshot
      
      ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/eeec4f5d4b66625a14be41e5ecbdc016/image.png)
      
      See merge request !846
      07956981
    • Douwe Maan's avatar
      Merge branch 'fix-error-500-internal-snippet' into 'master' · b2eef41d
      Douwe Maan authored
      Fix Error 500 when one user attempts to access another's personal, internal snippet
      
      ### What does this MR do?
      
      This MR fixes an Error 500 that occurred if one user tried to access another's personal, internal snippet. Steps to reproduce:
      
      ### Why was this MR needed?
      
      1. Go to `<hostname>/snippets/new`.
      2. Select "Internal".
      3. Create a snippet. Save the URL (e.g. `<hostname>/snippets/20`)
      4. Logout and sign in as another user.
      5. Go to the URL in step 3.
      
      ### What are the relevant issue numbers?
      
      Closes #1815
      
      See merge request !854
      b2eef41d
    • Achilleas Pipinellis's avatar
      Merge branch 'sshdoc' into 'master' · cbb1353b
      Achilleas Pipinellis authored
      Include non-default ssh key location info
      
      Fixes #875
      
      Provide help for people who aren't SSH-clued by indicating
      how to point to key files that have been named something
      other than the default. A lot of people seem to assume that
      the filename they choose is irrelevant and then wonder why
      their private key is not being found by simple 'ssh' commands.
      
      See merge request !507
      cbb1353b
    • Stan Hu's avatar
      e785b9d2
  4. 19 Jun, 2015 6 commits