summaryrefslogtreecommitdiff
path: root/features/steps
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'new-project-header-redesign' into 'master' Dmitriy Zaporozhets2015-12-242-3/+5
|\ | | | | | | | | | | | | | | | | | | | | Dropdowns for clone. Star and Fork with new count areas. Star and Unstarred Works now Fixes #2876 and #3482 Used existing styles. <br/> Did not attempt to make pixel perfect as styles already exist. <br/> ![Screen_Shot_2015-12-18_at_5.24.56_PM](/uploads/a79ba1e0be0232f2aeef8a43f3253479/Screen_Shot_2015-12-18_at_5.24.56_PM.png) See merge request !2156
| * Moves star code to a classJacob Schatz2015-12-231-2/+2
| |
| * fixes failing test by updating project clone instructionsJacob Schatz2015-12-231-4/+6
| |
| * spinach tests will pass nowJacob Schatz2015-12-231-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into emoji-picker-searchemoji-picker-searchValery Sizov2015-12-243-11/+31
|\ \
| * \ Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-241-10/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Add tests for new functionalityDouwe Maan2015-12-211-5/+20
| | | |
| | * | Fix specsDouwe Maan2015-12-191-1/+1
| | | |
| | * | Merge branch 'master' into edit-on-forkDouwe Maan2015-12-182-2/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/tree/_tree_header.html.haml
| | * | | Fix specs and behavior for LFS filesDouwe Maan2015-12-181-3/+3
| | | | |
| | * | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-181-1/+1
| | | | |
| * | | | Merge branch 'branch-invalid-name' into 'master' Douwe Maan2015-12-241-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add JS validation for invalid characters in branch name Fixes #3293 Demo: ![out-1080p](/uploads/ba21c359b6b8b440c40cacf772ec0df7/out-1080p.gif) See merge request !2122
| | * | | | Fix minor stylistic complaintsDouglas Barbosa Alexandre2015-12-211-1/+1
| | | | | |
| | * | | | Merge branch 'master' into branch-invalid-nameDouglas Barbosa Alexandre2015-12-182-2/+3
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Add JS validation for invalid characters in branch nameDouglas Barbosa Alexandre2015-12-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More info about valid ref names: https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.ht ml
| | * | | | Add more descriptive error message when create branch with invalid nameDouglas Barbosa Alexandre2015-12-161-1/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'issue_4189' into 'master' Douwe Maan2015-12-241-0/+4
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Fix redirect to wrong URL when merging and MR detail URL has an anchor. Closes #4189 See merge request !2169
| | * | | Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189issue_4189Rubén Dávila2015-12-211-0/+4
| | | | |
* | | | | emoji picker searchValery Sizov2015-12-231-0/+12
|/ / / /
* | | | add some spinachValery Sizov2015-12-221-0/+7
| | | |
* | | | fix specsValery Sizov2015-12-221-2/+2
|/ / /
* | | Backport JIRA serviceDrew Blessing2015-12-181-0/+18
| |/ |/|
* | Upgrade Poltergeist to 1.8.1. #4131issue_4131Rubén Dávila2015-12-172-2/+3
|/
* Fix specfix-milestone-snippet-headerDouwe Maan2015-12-161-1/+1
|
* Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-162-3/+3
|
* Merge branch 'master' into fix-milestone-snippet-headerDouwe Maan2015-12-167-23/+23
|\
| * Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-167-23/+23
| |\
| | * Fixed Rubocop offensesGabriel Mazetto2015-12-157-23/+23
| | |
* | | Fix testsDouwe Maan2015-12-161-1/+1
|/ /
* | Add spinach test for note pollingGrzegorz Bizon2015-12-151-0/+10
| | | | | | | | | | This also increases capybara timeout to 15 seconds (note polling interval). Capybara will look for new note for this period of time.
* | Preserve trailing new lines at the end of file on the online editorDouglas Barbosa Alexandre2015-12-141-0/+8
|/ | | | | Because Haml automatically indents the HTML source code, the contents of whitespace-sensitive tags like pre and textarea can get screwed up.
* Update commits spinach tests related to displaying build statusGrzegorz Bizon2015-12-141-0/+4
|
* Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-144-13/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987
| * Migrate CI::Project to ProjectKamil Trzcinski2015-12-114-13/+3
| |
* | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-141-0/+2
|\ \ | |/ | | | | | | | | | | Ci Services migrate See merge request !1985
| * Fix specsKamil Trzcinski2015-12-101-4/+4
| |
| * Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-102-4/+6
| |
* | Remove note from MR discussion when deleting it in the changes tabDouglas Barbosa Alexandre2015-12-101-0/+19
| |
* | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' Robert Speicher2015-12-101-0/+25
|\ \ | |/ |/| | | | | | | | | Fix editing notes on a merge request diff Fixes #3910 See merge request !2041
| * Merge branch 'master' into fix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-096-0/+80
| |\
| * | Ensure notes are replaced on a merge request diff when they're updatedDouglas Barbosa Alexandre2015-12-091-0/+25
| | |
* | | Merge branch 'move-network'Dmitriy Zaporozhets2015-12-091-4/+4
|\ \ \
| * | | Fix test for network shortcutmove-networkDmitriy Zaporozhets2015-12-092-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Move Network page from separate tab to sub tab of CommitsDmitriy Zaporozhets2015-12-092-4/+4
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-092-2/+2
|\ \ \ | |_|/ |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'master' into mr-brokenDouwe Maan2015-12-081-0/+9
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/helpers/ci_status_helper.rb
| * | | Use "Build passed" in tooltip instead of "Build status: passed"Douwe Maan2015-12-082-2/+2
| | | |
* | | | Simplify shared User SSH key stepsRobert Speicher2015-12-091-2/+2
| | | |
* | | | Merge branch 'default_clone_protocol_based_on_user_keys' into 'master' Robert Speicher2015-12-093-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering the clone page, check user profile to decide default clone protocol If the user has uploaded SSH-keys, use SSH; otherwise, use http(s). Closes #3504. See merge request !1998
| * \ \ \ Merge branch 'master' into default_clone_protocol_based_on_user_keysEirik Lygre2015-12-099-22/+80
| |\ \ \ \ | | | |_|/ | | |/| |
View Lorry Controller Status