summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix naming convention of LDAP testsJan-Willem van der Meer2014-08-293-0/+0
| |
* | Remove LDAP::Access#find_userJacob Vosmaer2014-08-291-12/+0
|/ | | | | | | | | | | This method existed to allow LDAP users to take over existing GitLab accounts if the part before the '@' of their LDAP email attribute matched the username of an existing GitLab user. I propose to disable this behavior in order to prevent unintended GitLab account takeovers. After this change it is still possible to take over an existing GitLab account with your LDAP credentials, as long as the GitLab account email address matches the LDAP user email address.
* Use readme we support to render if there are multiple readmesRobert Schilling2014-08-111-0/+28
|
* Fix satellite testsDmitriy Zaporozhets2014-08-061-69/+24
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix testDmitriy Zaporozhets2014-07-241-2/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add support to set satellites timeoutAyrton Araújo2014-07-211-1/+4
|
* Dont allow ? in project pathDmitriy Zaporozhets2014-07-081-0/+21
| | | | | | | Because it causes 500 error on every page where link to such project exists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fixed the specJeroen van Baarsen2014-06-141-1/+1
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Added an UrlBuilder for building rails named routesJeroen van Baarsen2014-06-131-0/+11
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Improve ad_disabled method nameJacob Vosmaer2014-05-141-2/+2
|
* Add spec for LDAP::Access#allowed?Jacob Vosmaer2014-05-141-0/+32
|
* Backport Adapter#dn_matches_filter? from EEJacob Vosmaer2014-05-141-0/+31
|
* Add support for Jira ticket mentions in format JIRA-123.Marin Jankovski2014-05-131-0/+6
| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG-EE
* Add nickname to oauth_specDmitriy Zaporozhets2014-04-071-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix tests that dont respect project-fork relation. pt2Dmitriy Zaporozhets2014-04-031-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix ldap_user_auth_specDmitriy Zaporozhets2014-03-101-1/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Make the Gitlab::Popen path argument optionalJacob Vosmaer2014-02-251-0/+9
|
* Change Gitlab::Popen to use arrays for commandsJacob Vosmaer2014-02-251-2/+9
|
* Merge branch 'master' into reference_relative_linksMarin Jankovski2014-01-244-9/+10
|\ | | | | | | | | Conflicts: spec/models/project_spec.rb
| * Merge branch 'improve/mr_diff'Dmitriy Zaporozhets2014-01-233-4/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/project_fork.rb features/steps/project/project_forked_merge_requests.rb features/steps/project/project_issue_tracker.rb features/steps/project/project_markdown_render.rb features/steps/shared/project.rb
| | * Fix satellites specsDmitriy Zaporozhets2014-01-231-2/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Make changes to testsDmitriy Zaporozhets2014-01-223-3/+3
| | | | | | | | | | | | | | | | | | | | | * project_with_code -> project * project -> ermpty_project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove deprecated findersskv2014-01-191-5/+5
| |/
* | Use the correct paths.Marin Jankovski2014-01-231-1/+1
|/
* Use same code for diff and patch inside MergeActionDmitriy Zaporozhets2014-01-131-3/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* fix most of warningsskv2013-12-153-7/+7
|
* Minor version upgraderDmitriy Zaporozhets2013-12-131-0/+24
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* More fixes to test because of long passwordDmitriy Zaporozhets2013-11-251-5/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Test if markdown is rendered properly.Marin Jankovski2013-10-111-1/+1
|
* Added ldap testsIzaak Alpert2013-09-221-46/+5
| | | | Change-Id: Ifd77615b3b92d7d8bca92b8875aa8204356cfd85
* Allows username only updates to ldap propertiesIzaak Alpert2013-09-221-0/+98
| | | | | | | | | -when logging in if users are allowed to login with just usernames in ldap we will update uid of the user if their uid is out of date Conflicts: spec/lib/auth_spec.rb Change-Id: Ia171b3d5133da86edc18c0d08ecfaf6a174f2574
* Rewrite OAuth specsDmitriy Zaporozhets2013-09-042-88/+56
|
* Link issues from comments and automatically close themash wilson2013-08-251-0/+95
| | | | | | | | | | Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown references in descriptions, titles, or attached Notes creates a back-reference Note that links to the original referencer. Furthermore, pushing commits with commit messages that match a (configurable) regexp to a project's default branch will close any issues mentioned by GFM in the matched closing phrase. If accepting a merge request would close any Issues in this way, a banner is appended to the merge request's main panel to indicate this.
* Fix tests after can_create_team was removedDmitriy Zaporozhets2013-08-211-1/+0
|
* Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into ↵Dmitriy Zaporozhets2013-08-081-9/+22
|\ | | | | | | karlhungus-mr-on-fork
| * Updated format_patch to use '..' rather than '...'Izaak Alpert2013-07-301-9/+22
| | | | | | | | | | | | Was incorrectly including commits reachable from rev2. Change-Id: I3560e5d5ce474ba3d374f29ae16190b1f74989be
* | Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into ↵Dmitriy Zaporozhets2013-07-302-0/+251
|\ \ | |/ | | | | | | | | | | | | | | karlhungus-mr-on-fork Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
| * Raise Error for diff_between/commit_between for non fork mr's in satelliteIzaak Alpert2013-07-171-12/+4
| | | | | | | | | | | | | | -Fixed tests to account for this -Trigger update after update_branches for list:update selecting first commit, have it also trigger sha lookup Change-Id: Ie4c3d4fbf57aeadd7d141d3704f4ea0f0684a7a5
| * Style changes from review with @randxIzaak Alpert2013-07-172-12/+0
| | | | | | | | | | | | -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
| * MR on fork: Some cleanup, test updatesIzaak Alpert2013-07-172-47/+44
| | | | | | | | | | | | | | | | | | | | -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-171-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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-172-0/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix typosJohannes Schleifenbaum2013-07-291-1/+1
|/
* Remove teams specsDmitriy Zaporozhets2013-06-181-28/+0
|
* Its better to load graph with ajax since it requires ~10 seconds for bigger ↵Dmitriy Zaporozhets2013-06-052-73/+0
| | | | projects to finish up
* Contributors graphs feature for GitLabKarlo Soriano2013-06-052-0/+73
| | | | | | | | | | Created tests and refactored some code along the way Added stat graph util spec, refactored code finsihed up tests and refactors finsihed up tests and refactors
* Fix bug with team assignation on project from #4109Andrey Kumanyaev2013-06-011-0/+28
|
* Add settings for user permission defaultsDmitry Medvinsky2013-05-161-0/+10
| | | | | | “Can create groups” and “Can create teams” had hardcoded defaults to `true`. Sometimes it is desirable to prohibit these for newly created users by default.
* Add Gitlab::VersionInfo class to fix and simplify version check.Sato Hiroyuki2013-05-081-0/+69
| | | | | It returns "yes" if required version is "1.7.10" and current version is "1.6.10", because the patch version of current version equals to that of required version.
* Merge pull request #3597 from amacarthur/fork-pull-requestDmitriy Zaporozhets2013-05-021-0/+1
|\ | | | | updated fork feature to use gitlab-shell for v5 of gitlab
View Lorry Controller Status