Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-04Only publish ssh key-type and keyZeger-Jan van de Weg
2015-07-10Add User#disable_two_factor!Robert Speicher
This method encapsulates all the logic for disabling 2FA on a specific User model.
2015-06-19Add convenience methods to User for getting and setting 2FA statusRobert Speicher
2015-05-27Merge branch 'rs-manual-2fa-entry' into 'master'Dmitriy Zaporozhets
Add support for manually entering 2FA details > ![Screen_Shot_2015-05-22_at_6.39.26_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/27b6cc0b2f88e0ccec234dd8d20db957/Screen_Shot_2015-05-22_at_6.39.26_PM.png) Related to #1679 though I'm not sure if it entirely fixes it, since I don't have access to a Windows Phone. See merge request !694
2015-05-24Bump secret key length to 32Robert Speicher
2015-05-23Add support for manually entering 2FA detailsRobert Speicher
2015-05-21Update ffaker gemRobert Speicher
Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`.
2015-05-10Add :two_factor trait to User factoryRobert Speicher
2015-05-03Merge pull request #9066 from jirutka/fix-6417Dmitriy Zaporozhets
Fix #6417: users with group permission should be able to create groups via API
2015-04-14Merge branch 'rs-remove-invalid-key-factories' into 'master'Dmitriy Zaporozhets
Remove the invalid key factories They're only used once each, and they're easy to build in-place. See merge request !1766
2015-04-12Remove the invalid key factoriesRobert Speicher
They're only used once each, and they're easy to build in-place.
2015-04-03Add admin deploy keys tests.Douwe Maan
2015-03-31Fix #6417: users with group permission should be able to create groups via APIRobert Schilling
2014-12-28Remove unneeded password_confirmation from seed.Ciro Santilli
2014-12-12Fix snippet factoryDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-04Supporting for multiple omniauth provider for the same userValery Sizov
2014-10-13Merge tests to support Multiple LDAP groupsJan-Willem van der Meer
2014-09-15Fix adminarea and emails for new membership logicDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14Huge replace of old users_project and users_group referencesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-10Serialize services propertiesDrew Blessing
2014-08-01Fix project and notes specsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31Fix form mr testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31Fix MR factory and some MR testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31Dont stub gitlab-shell calls. Make test environment closer to real oneDmitriy Zaporozhets
2014-06-30Enable snippets by default in project factoryDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-23Implements drag and drop upload in creating issuesEarle Bunao & Neil Calabroso
2014-03-19Merge pull request #6557 from tsigo/faster-merge-request-featuresDmitriy Zaporozhets
Speed up features/notes_on_merge_requests_spec
2014-03-19Add public/private/internal traits to :project FactoryRobert Speicher
2014-03-19Speed up features/notes_on_merge_requests_specRobert Speicher
This spec featured the slowest tests in the entire suite. After some debugging, the cause was found to be the large commit diff generated by comparing the stable and master branches. To fix this, the seed repository was modified to create a simple branch off of master that consists of three simple commits and minor changes. The spec was then updated to compare master to this branch instead of stable. The result is a spec group that runs in under 30 seconds, down from about 90.
2014-02-23Blob and tree gfm links to anchors work.Ciro Santillli
Fixes #6046
2014-02-14Add email aliases for usersJason Hollingsworth
Emails are used to associate commits with users. The emails are not verified and don't have to be valid email addresses. They are assigned on a first come, first serve basis. Notifications are sent when an email is added.
2014-02-11Split the user ssh keys by newline, not the characters "\n"Johannes Schleifenbaum
before: GET /user.keys ssh-rsa ...\nssh-rsa ...\nssh-rsa ... after: GET /user.keys ssh-rsa ... ssh-rsa ... sha-rsa ...
2014-01-23Fix MR spinach testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22Make changes to testsDmitriy Zaporozhets
* project_with_code -> project * project -> ermpty_project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25Fix tests after user password length was changedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12Clear state in test satellite dir.Marin Jankovski
2013-10-17Speed up testsDmitriy Zaporozhets
2013-10-15Oauth users and users created by admin should be confirmed immediatlyDmitriy Zaporozhets
2013-09-26Ignore owner_id for Group in testsDmitriy Zaporozhets
2013-09-13Drop support of root namespace in routingHiroyuki Sato
2013-07-18Style changes from review with @randxIzaak Alpert
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
2013-07-18Rebased on 6.0Izaak Alpert
-Had to do some minor test clean up as well Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
2013-07-18MR on fork: Email fixes, style fixesIzaak Alpert
-Removed many extra spaces I added -Fixed email templates to be consistent/better looking GITLAB-894, GITLAB-895, (GITLAB-858) Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
2013-07-18Merge Request on forked projectsIzaak Alpert
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
2013-07-02Merge branch 'master' into 6-0-devDmitriy Zaporozhets
Conflicts: app/views/dashboard/projects.html.haml app/views/layouts/_head_panel.html.haml config/routes.rb
2013-07-01Ability to edit commentsJack Weeden
2013-06-22remove useless routing tests. Added symlink creation for project with codeDmitriy Zaporozhets
2013-06-22Fix broken factoryDmitriy Zaporozhets
2013-06-22Remove form for adding user to several projects from admin area.Dmitriy Zaporozhets
Remove unnecessary projects order on User#show
2013-06-04Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into ↵Dmitriy Zaporozhets
Andrew8xx8-gist Conflicts: Gemfile.lock app/models/ability.rb app/models/project.rb app/views/snippets/_form.html.haml db/schema.rb features/steps/shared/paths.rb spec/factories.rb spec/models/project_spec.rb