summaryrefslogtreecommitdiff
path: root/features/steps
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Move ssh-key steps into SharedUser. Change references in "Explore Projects" ↵Eirik Lygre2015-12-093-8/+10
| | | | | | | | | | | | | | | | | | | | feature. Apply ssh-key requirement to "Project Create" feature.
| * | | | Add spinach tests for the clone protocol selection.Eirik Lygre2015-12-091-0/+8
| | | | |
* | | | | Merge branch 'fix-admin-should-be-able-to-add-himself-to-group' into 'master' Dmitriy Zaporozhets2015-12-093-0/+70
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed in Admin can add/remove himself to a group/project Fixes #3640 /cc @JobV Could you have a look as well? See merge request !1942
| * | | | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-086-17/+43
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-049-33/+67
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-034-8/+8
| |\ \ \ \ \
| * | | | | | Signed in admin should be able to add/remove himself to a projectDouglas Barbosa Alexandre2015-12-011-0/+37
| | | | | | |
| * | | | | | Signed in admin should be able to add/remove himself to a groupDouglas Barbosa Alexandre2015-12-012-0/+33
| | | | | | |
* | | | | | | Merge branch 'mr-builds' into 'master' Dmitriy Zaporozhets2015-12-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Builds tab to MR detail page ## Before ![Screen_Shot_2015-12-08_at_13.21.04](/uploads/0d26060bef78f3de076e33439b8a4789/Screen_Shot_2015-12-08_at_13.21.04.png) ## After ![Screen_Shot_2015-12-08_at_13.25.20](/uploads/be7d7fd6d4fc8c5cc366b5b3778b813a/Screen_Shot_2015-12-08_at_13.25.20.png) Fixes #3907 See merge request !2016
| * \ \ \ \ \ \ Merge branch 'master' into mr-buildsDouwe Maan2015-12-082-0/+36
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/views/projects/merge_requests/widget/_heading.html.haml
| * | | | | | | Fix specmr-buildsDouwe Maan2015-12-081-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'edit-in-patch-branch' into 'master' Robert Speicher2015-12-081-4/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default target branch to patch-n when editing file in protected branch Fixes #3441 See merge request !2021
| * | | | | | Fix specDouwe Maan2015-12-081-4/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'languages-graph' into 'master' Robert Speicher2015-12-081-0/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Languages graph See merge request !2009
| * | | | | Add tests and changelog item for language graphslanguages-graphDmitriy Zaporozhets2015-12-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-081-0/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976
| * | | | | Fix specs caused by update of gitlab-test repo.serve_lfs_objectMarin Jankovski2015-12-081-0/+1
| | | | | |
| * | | | | Add specs for showing lfs object in UI.Marin Jankovski2015-12-071-0/+26
| | |_|/ / | |/| | |
* | | | | Add custom ColorValidatorRobert Speicher2015-12-072-2/+2
| |/ / / |/| | |
* | | | Merge branch 'fix-random-failing-test' into 'master' Dmitriy Zaporozhets2015-12-071-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix random failing test Make sure we wait till page reloads after request was merged. Otherwise we get request running which fails next test Improvement for !1897 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2004
| * | | | Fix random failing testDmitriy Zaporozhets2015-12-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we wait till page reloads after request was merged. Otherwise we get request running which fails next test Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-12-071-3/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix specStan Hu2015-12-041-3/+1
| | | | |
* | | | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-072-12/+36
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems with award-emoji-only comment This fixes a conflict between note with only a single emoji in content and award-emojis mechanisms. Closes #3734 cc @vsizov See merge request !1936
| * | | | Add feature test for emoji-only diff notesGrzegorz Bizon2015-12-031-0/+17
| | | | | | | | | | | | | | | | | | | | This specs is related to bug described in #3734 (award-emojis).
| * | | | Add test for award-emoji being added as regular commentGrzegorz Bizon2015-12-031-12/+19
| | |/ / | |/| |
* | | | Ensure "Remove Source Branch" button is not shown when branch is being ↵Rubén Dávila2015-12-041-0/+35
| |/ / |/| | | | | | | | deleted. #3583
View Lorry Controller Status