summaryrefslogtreecommitdiff
path: root/features/project
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'emoji-picker-search'into emoji_picker_frequently_usedemoji_picker_frequently_usedValery Sizov2015-12-243-2/+20
|\
| * fixes after reviewValery Sizov2015-12-241-1/+1
| |
| * emoji picker searchValery Sizov2015-12-231-0/+6
| |
| * add some spinachValery Sizov2015-12-221-0/+5
| |
| * Backport JIRA serviceDrew Blessing2015-12-181-0/+6
| |
| * Add spinach test for note pollingGrzegorz Bizon2015-12-151-0/+6
| | | | | | | | | | This also increases capybara timeout to 15 seconds (note polling interval). Capybara will look for new note for this period of time.
* | add some spinachValery Sizov2015-12-221-0/+5
|/
* Preserve trailing new lines at the end of file on the online editorDouglas Barbosa Alexandre2015-12-141-0/+11
| | | | | 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-1/+2
|
* Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-141-6/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-6/+0
| |
| * Fix specsKamil Trzcinski2015-12-101-4/+4
| |
| * Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-101-4/+4
| |
* | Remove note from MR discussion when deleting it in the changes tabDouglas Barbosa Alexandre2015-12-101-0/+10
| |
* | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' Robert Speicher2015-12-101-0/+10
|\ \ | |/ |/| | | | | | | | | 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-0914-1/+15
| |\
| * | Ensure notes are replaced on a merge request diff when they're updatedDouglas Barbosa Alexandre2015-12-091-0/+10
| | |
* | | Merge branch 'move-network'Dmitriy Zaporozhets2015-12-092-6/+8
|\ \ \ | |_|/ |/| |
| * | Fix test for network shortcutmove-networkDmitriy Zaporozhets2015-12-091-1/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Move Network page from separate tab to sub tab of CommitsDmitriy Zaporozhets2015-12-091-5/+6
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'split-up-builds' into 'master' Dmitriy Zaporozhets2015-12-0913-1/+13
|\ \ | | | | | | | | | | | | | | | | | | Split up 20min+ `spec:other` and `spinach:project` builds to increase parallelization See merge request !2036
| * | Tag feature specsDouwe Maan2015-12-0913-1/+13
| |/
* | Merge branch 'master' into default_clone_protocol_based_on_user_keysEirik Lygre2015-12-095-9/+26
|\ \ | |/
| * Merge branch 'edit-in-patch-branch' into 'master' Robert Speicher2015-12-081-6/+0
| |\ | | | | | | | | | | | | | | | | | | Default target branch to patch-n when editing file in protected branch Fixes #3441 See merge request !2021
| | * Fix specDouwe Maan2015-12-081-6/+0
| | |
| * | Merge branch 'languages-graph' into 'master' Robert Speicher2015-12-081-0/+5
| |\ \ | | |/ | |/| | | | | | | Languages graph See merge request !2009
| | * Add tests and changelog item for language graphslanguages-graphDmitriy Zaporozhets2015-12-081-0/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-081-0/+6
| |\ \ | | |/ | |/| | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976
| | * Add specs for showing lfs object in UI.Marin Jankovski2015-12-071-0/+6
| | |
| * | Fix random failing testDmitriy Zaporozhets2015-12-071-2/+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 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-072-1/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+6
| | | | | | | | | | | | | | | | This specs is related to bug described in #3734 (award-emojis).
| | * | Add test for award-emoji being added as regular commentGrzegorz Bizon2015-12-031-1/+5
| | |/
* | | Move ssh-key steps into SharedUser. Change references in "Explore Projects" ↵Eirik Lygre2015-12-091-0/+2
|/ / | | | | | | feature. Apply ssh-key requirement to "Project Create" feature.
* | Ensure "Remove Source Branch" button is not shown when branch is being ↵Rubén Dávila2015-12-041-0/+17
|/ | | | deleted. #3583
* Refactor group members tests a bitDmitriy Zaporozhets2015-11-251-4/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'emoji_votes' into 'master' Dmitriy Zaporozhets2015-11-191-0/+14
|\ | | | | | | | | | | | | | | | | | | Award Emoji This it first iteration of award emoji feature. We have plan to extend emoji picker by the next release. For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825
| * added spinach testsValery Sizov2015-11-191-0/+14
| |
* | Fix feature spec.Douwe Maan2015-11-181-7/+7
|/
* Merge branch 'issue_3072_target_name' into 'master' Dmitriy Zaporozhets2015-11-101-0/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | Display target branch on MR list when it is different from project's default Fixes #3072 The screenshot below shows both previous and current UI state: ![branch-mr-both](/uploads/5c1f0519e42bae4655f3eee37edfc356/branch-mr-both.png) First merge request has default branch as a target, second one has non default branch as target. See merge request !1741
| * Display target branch on MR list when it is different from project's defaultAnton Baklanov2015-11-101-0/+9
| |
* | Add tests to release notes featureDmitriy Zaporozhets2015-11-061-0/+12
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix testDmitriy Zaporozhets2015-11-061-1/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Rewrite remove tag testDmitriy Zaporozhets2015-11-061-8/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add ability to create directories in the editorBen Ford2015-10-291-0/+10
| | | | | | | | | | | | | Simply type a name with a `/` directory separator and new directories will be created. This does not do the fancy UI work that github.com does, but it will get the job done. I could not find tests for file creation, so I didn't add a test for this slight behaviour modification. I did test directory traversals though, using both absolute paths like `/tmp/foo.txt` and relative paths like `../../foo.txt`. Neither case escaped the repository, though attempting to traverse with a relative path resulted in a 500 error that did not affect application stability upon reload.
* Add tests for MR index pageDmitriy Zaporozhets2015-10-231-0/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' into add-dates-snippets-showHan Loong Liauw2015-10-172-0/+12
|\
| * Add tests for last commit info on project home pageDmitriy Zaporozhets2015-10-161-0/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix error preventing displaying of commit data for a directory with a ↵Stan Hu2015-10-121-0/+6
| | | | | | | | | | | | leading dot Closes https://github.com/gitlabhq/gitlabhq/issues/8763
* | fix spinach features to use new button wordingsHan Loong Liauw2015-10-151-1/+1
|/ | | | Also fixed an accidental deletion of pratial
View Lorry Controller Status