1. 24 Dec, 2015 12 commits
    • Dmitriy Zaporozhets's avatar
      Merge branch 'edit-on-fork' into 'master' · 76b7e24f
      Dmitriy Zaporozhets authored
      Automatically fork a project when not allowed to edit a file.
      
      Fixes #3215.
      
      To do:
      
      - [ ] Add tests
      
      -----
      
      ## "Edit" button on file in a project the user does NOT have write access to
      
      ![edit_file](/uploads/7602157420768aef483a6586bba2d164/edit_file.png)
      
      ## Clicking will automatically create a fork
      
      ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png)
      
      ## When the fork has been created, the user is returned to the edit page on the original project with a notice
      
      ![edit_notice](/uploads/94ed1319404370ff1e9c0d672fb41e03/edit_notice.png)
      
      ## The user cannot change the target branch and is informed that editing will start an MR
      
      ![edit_footer](/uploads/4da68d4795c7177e575b7c434d16eeae/edit_footer.png)
      
      ## Hitting "Commit changes" will commit and start an MR from my fork to the origin project
      
      ![Screen_Shot_2015-12-17_at_23.38.08](/uploads/d777a4db6f38a5a1be84031694465bc1/Screen_Shot_2015-12-17_at_23.38.08.png)
      
      -----
      
      ## "Create file, "Upload file" and "New directory" buttons in a project the user does NOT have write access to
      
      ![new_directory](/uploads/72f556248f30d6652523bbb4be01b3e0/new_directory.png)
      
      ## Clicking any of these options will automatically create a fork
      
      ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png)
      
      ## When the fork has been created, the user is returned to the tree page on the original project with a notice
      
      ![new_directory_notice](/uploads/a1a3e11308ae0e8f0913fae6813a37ed/new_directory_notice.png)
      
      ## Clicking "New directory" again will show the modal. The user cannot change the target branch and is informed that editing will start an MR
      
      ![new_dir](/uploads/99ca8cbfb2f70603e352b3fdf67b6281/new_dir.png)
      
      ## Hitting "Create directory" will commit and start an MR from my fork to the origin project
      
      ![Screen_Shot_2015-12-17_at_23.39.19](/uploads/3713d0235abf831361b803a6198c5bc1/Screen_Shot_2015-12-17_at_23.39.19.png)
      
      cc @dzaporozhets @skyruler
      
      See merge request !2145
      76b7e24f
    • Douwe Maan's avatar
      Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' · 84e75ebd
      Douwe Maan authored
      Fix/visibility level setting in forked projects
      
      Fixes #3136
      
      /cc @DouweM 
      
      See merge request !1744
      84e75ebd
    • Douwe Maan's avatar
      Merge branch 'branch-invalid-name' into 'master' · 6b968a8f
      Douwe Maan authored
      Add JS validation for invalid characters  in branch name
      
      Fixes #3293 
      
      Demo:
      
      ![out-1080p](/uploads/ba21c359b6b8b440c40cacf772ec0df7/out-1080p.gif)
      
      
      See merge request !2122
      6b968a8f
    • Douwe Maan's avatar
      Merge branch 'issue_4189' into 'master' · 541da4d5
      Douwe Maan authored
      Fix redirect to wrong URL when merging and MR detail URL has an anchor.
      
      Closes #4189
      
      See merge request !2169
      541da4d5
    • Valery Sizov's avatar
      Merge branch 'emoji-picker-fix' into 'master' · e622259d
      Valery Sizov authored
      Emoji picker: better alias handling
      
      related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3576
      
      See merge request !2198
      e622259d
    • Dmitriy Zaporozhets's avatar
      Merge branch 'rs-bump-underscore-rails' into 'master' · 75c3a2f8
      Dmitriy Zaporozhets authored
      Bump underscore-rails to ~> 1.8.0
      
      Addresses #2857
      
      See merge request !2193
      75c3a2f8
    • Dmitriy Zaporozhets's avatar
      Merge branch 'filter-project-list-fix' into 'master' · d095cbd7
      Dmitriy Zaporozhets authored
      fixes the search for projects
      
      Also makes improvements for jQuery queries. <br/>
      @creamzy @skyruler <br/>
      Fixes issues introduced in MR for #3943
      
      See merge request !2194
      d095cbd7
    • Valery Sizov's avatar
      fix spec · 09c5968f
      Valery Sizov authored
      09c5968f
    • Tomasz Maczukin's avatar
    • Valery Sizov's avatar
      Emoji picker: better alias handling · b6de0d28
      Valery Sizov authored
      b6de0d28
    • Robert Speicher's avatar
      Merge branch 'its-its' into 'master' · 94a55045
      Robert Speicher authored
      Fix spelling of "it's" to "its" where appropriate.
      
      [ci skip]
      
      See merge request !2196
      94a55045
    • cafuego's avatar
      9c893af7
  2. 23 Dec, 2015 28 commits