summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Fix an issue with edits sending user back to @source_projectIzaak Alpert2013-07-172-0/+25
| | | | | | | -Form was for @source_project rather then @project. -add spinach test for edit submission on forked project Change-Id: I807a5077608b7e910f4bc83c5d3e82c378f70a9e
* Style changes from review with @randxIzaak Alpert2013-07-172-18/+16
| | | | | | -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
* Rebased on 6.0Izaak Alpert2013-07-171-1/+2
| | | | | | -Had to do some minor test clean up as well Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
* MR on fork: Email fixes, style fixesIzaak Alpert2013-07-175-14/+0
| | | | | | | | | -Removed many extra spaces I added -Fixed email templates to be consistent/better looking GITLAB-894, GITLAB-895, (GITLAB-858) Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
* Rebase on masterIzaak Alpert2013-07-171-3/+9
| | | | | Trying to retrigger travis Change-Id: Ifd86fb4c6b2791ad176230254fbf69a9ade979fb
* MR on fork validation errorIzaak Alpert2013-07-172-0/+24
| | | | | | Wasn't setting fields so validations would fail Change-Id: I0363c57bf6c8b9937cc1b4140d09071d7c5168c2
* MR on fork: Some cleanup, test updatesIzaak Alpert2013-07-171-21/+28
| | | | | | | | | | -The forked merge request test now tests it's componenets again, and seems to work every time (did this by reordering the branch updates so their is more time for update_branches to run) -- this could still technically fail, but after several runs it doesn't seem to. -Removed todo in merge_request, pushed wrapping of grit down to the satellite -updated action test to check flock status, made it nolonger pending -moved all logging on failure to helper method in satellite GITLAB-592 Change-Id: If0554ca35eedc3d3e8461f7d93d4b3939fa2cd75
* MR on Fork multiple fixesIzaak Alpert2013-07-172-19/+42
| | | | | | | | | | | | | | | | | | | | | | | -Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
* Merge Request on forked projectsIzaak Alpert2013-07-1713-19/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
* update tests with new routingDmitriy Zaporozhets2013-07-161-1/+1
|
* Fix tests and tab highlightDmitriy Zaporozhets2013-07-161-1/+1
|
* Fixed network testsDmitriy Zaporozhets2013-07-151-6/+6
|
* Remove unnecessary title. Fix graphs width for less then 1214px resolutionDmitriy Zaporozhets2013-07-151-1/+0
|
* fix tests. improve ui-box titleDmitriy Zaporozhets2013-07-133-3/+3
|
* Rename Group#people to Group#membersDmitriy Zaporozhets2013-07-122-3/+3
|
* Test user page with spinachDmitriy Zaporozhets2013-06-262-0/+17
|
* Add scenario for expired passwordDmitriy Zaporozhets2013-06-262-15/+40
|
* Add profile notification spinachDmitriy Zaporozhets2013-06-262-0/+21
|
* Test admin:group#indexDmitriy Zaporozhets2013-06-262-0/+9
|
* Fix ssh key testDmitriy Zaporozhets2013-06-241-1/+1
|
* Fix ssh key testDmitriy Zaporozhets2013-06-241-1/+1
|
* Move Profile related controllers under Profiles:: moduleDmitriy Zaporozhets2013-06-242-3/+3
|
* Lets fix testsDmitriy Zaporozhets2013-06-224-8/+13
|
* remove useless routing tests. Added symlink creation for project with codeDmitriy Zaporozhets2013-06-222-4/+4
|
* Fix admin:groups testDmitriy Zaporozhets2013-06-201-2/+5
|
* Fixed sub navs spinach tests for projectDmitriy Zaporozhets2013-06-193-42/+24
|
* Merge branch 'improve/dash_projects_page' of ↵Dmitriy Zaporozhets2013-06-192-16/+0
|\ | | | | | | /home/git/repositories/gitlab/gitlabhq into 6-0-dev
| * Remove dash projects search testDmitriy Zaporozhets2013-06-192-16/+0
| |
* | Fix random failing tests with project teamsDmitriy Zaporozhets2013-06-191-18/+4
|/
* More userteam links removed. Removed teams spinach testsDmitriy Zaporozhets2013-06-182-306/+0
|
* Remove all team resources except models. Move models to deprecated directoryDmitriy Zaporozhets2013-06-182-306/+0
|
* Fixin testsDmitriy Zaporozhets2013-06-182-4/+18
|
* Proper naming for project members pageDmitriy Zaporozhets2013-06-181-2/+2
|
* Fix spinach groupDmitriy Zaporozhets2013-06-181-3/+3
|
* Fixed tests. Fixed overrided scope. Better usability for milestone viewDmitriy Zaporozhets2013-06-172-3/+3
|
* Merge pull request #4269 from dosire/scrum-view-for-milestoneDmitriy Zaporozhets2013-06-162-8/+0
|\ | | | | Scrum view style milestone view.
| * Incorporated the two suggestions (h5 and named variables) and fixed the ↵Sytse Sijbrandij2013-06-122-8/+0
| | | | | | | | Spinach test.
* | FIx userteams testsDmitriy Zaporozhets2013-06-151-21/+5
| |
* | Fix MR featureDmitriy Zaporozhets2013-06-141-2/+2
| |
* | Fix tab tests. Prevent 500 if user.last_sign_in_at is nilDmitriy Zaporozhets2013-06-141-4/+4
| |
* | Style page for project assign to team. Fix test for admin:teamsDmitriy Zaporozhets2013-06-111-1/+1
| |
* | fix group:people tests after prev commitDmitriy Zaporozhets2013-06-112-1/+3
| |
* | Solve inconsistency between network graph & stat graphsDmitriy Zaporozhets2013-06-113-3/+3
| |
* | Fix admin:group spinach. Remove selecting .all projects for admin user at ↵Dmitriy Zaporozhets2013-06-102-3/+3
|/ | | | teams page
* Merge pull request #4178 from docwhat/use-COLOR_SCHEMESDmitriy Zaporozhets2013-06-061-1/+1
|\ | | | | design pages now uses the COLOR_SCHEMES
| * design pages now uses the COLOR_SCHEMESChristian Höltje2013-06-051-1/+1
| | | | | | | | | | This unifies the code color-scheme code and makes adding new schemes a little easier.
* | Move search to separate layoutDmitriy Zaporozhets2013-06-062-9/+0
| |
* | Merge pull request #4155 from babatakao/selectable_master_project_deploy_keysDmitriy Zaporozhets2013-06-051-0/+1
|\ \ | | | | | | Selectable deploy keys contain master projects
| * | Selectable deploy keys contain master projectsbabatakao2013-06-051-0/+1
| | |
* | | Fix snippets testDmitriy Zaporozhets2013-06-062-2/+2
| | |
View Lorry Controller Status