summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
...
| * | Make default value for otp_required_for_login false instead of nullRobert Speicher2015-06-201-2/+2
| * | Allow Admin to filter users by 2FA statusRobert Speicher2015-06-192-10/+76
* | | Merge branch 'fix-project-icon-links' into 'master'Dmitriy Zaporozhets2015-06-232-8/+8
|\ \ \
| * | | Fix avatar tests to use banana_sample.gif since SVG is not supportedStan Hu2015-06-222-8/+8
* | | | Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-221-3/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge requests API returns closed for closed and merged for merged.revert-mr-state-namesDmitriy Zaporozhets2015-06-221-3/+2
* | | | Merge branch 'rs-rspec3' into 'master'Dmitriy Zaporozhets2015-06-2282-452/+516
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix Gitlab::OAuth::User specrs-rspec3Robert Speicher2015-06-221-37/+48
| * | | Add sleep call before yield in allowing_for_delayRobert Speicher2015-06-221-0/+2
| * | | Change `to_not` calls to `not_to`Robert Speicher2015-06-2213-25/+25
| * | | Fix `raise_error` without an argument deprecation warningsRobert Speicher2015-06-228-16/+16
| * | | Remove junk from db_cleaner spec support fileRobert Speicher2015-06-221-29/+0
| * | | Move CapybaraHelpers to its own support fileRobert Speicher2015-06-222-33/+32
| * | | Fix GitPushService specRobert Speicher2015-06-221-4/+6
| * | | Replace remaining references to `Note.create_cross_reference_note`Robert Speicher2015-06-224-12/+12
| * | | Use to_reference for issue and merge request mentionable specsRobert Speicher2015-06-222-4/+4
| * | | Update spec/features/security specsRobert Speicher2015-06-222-43/+26
| * | | Update email_spec gemRobert Speicher2015-06-222-1/+1
| * | | Update mock and stub syntax for specsRobert Speicher2015-06-2246-216/+268
| * | | Update and simplify Import controller specsRobert Speicher2015-06-226-36/+75
| * | | Fix include_module matcherRobert Speicher2015-06-221-1/+5
| * | | Fix features syntaxRobert Speicher2015-06-221-1/+1
| * | | Started on the actual rspec 3 upgradeJeroen van Baarsen2015-06-221-0/+1
* | | | Merge branch 'rs-remove-link-to-override'Dmitriy Zaporozhets2015-06-221-37/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove overridden `link_to` helperrs-remove-link-to-overrideRobert Speicher2015-06-171-37/+0
* | | | Merge branch 'rs-dev-issue-2355' into 'master'Dmitriy Zaporozhets2015-06-225-15/+242
|\ \ \ \
| * | | | Add MergeRequestTabs specsrs-dev-issue-2355Robert Speicher2015-06-212-0/+104
| * | | | Fix timezone-based time_ago_with_tooltip spec failuresRobert Speicher2015-06-191-4/+5
| * | | | Load the Merge Request > Commits tab lazilyRobert Speicher2015-06-171-15/+64
| * | | | Move Projects::MergeRequestsController spec to its correct locationRobert Speicher2015-06-171-0/+0
| * | | | Spec and refactor User.find_for_commitRobert Speicher2015-06-171-0/+25
| * | | | Update time_ago_with_tooltip helperRobert Speicher2015-06-171-0/+48
| |/ / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-227-9/+217
|\ \ \ \
| * \ \ \ Merge branch 'fix-error-500-internal-snippet' into 'master'Douwe Maan2015-06-201-0/+5
| |\ \ \ \
| | * | | | Fix Error 500 when one user attempts to access a personal, internal snippetStan Hu2015-06-191-0/+5
| | | |/ / | | |/| |
| * | | | Merge branch 'rs-blobview-js-refactor' into 'master'Robert Speicher2015-06-192-0/+159
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Refactor LineHighlighterrs-blobview-js-refactorRobert Speicher2015-06-191-41/+22
| | * | | Rename BlobView to LineHighlighterRobert Speicher2015-06-192-9/+9
| | * | | Refactor and spec BlobView JSRobert Speicher2015-06-192-0/+178
| | |/ /
| * | | Use User#two_factor_enabled instead of otp_required_for_loginrs-dev-issue-2415Robert Speicher2015-06-191-4/+4
| * | | Add 2FA status to Admin::Users#showRobert Speicher2015-06-191-4/+24
| * | | Add convenience methods to User for getting and setting 2FA statusRobert Speicher2015-06-192-1/+25
| |/ /
* | | Merge branch 'snippet_optional_filename' into 'master'Douwe Maan2015-06-201-1/+0
|\ \ \ | |/ / |/| |
| * | Make snippet filename optional.Nicolas2015-06-201-1/+0
* | | Add init test for ProjectSearchResultsStan Hu2015-06-181-0/+23
* | | Merge branch 'fix-labels-permisssion-check' into 'master'Douwe Maan2015-06-181-0/+40
|\ \ \
| * | | Fix 403 Access Denied error messages when accessing Labels section in a proje...Stan Hu2015-06-181-0/+40
* | | | Fix behavior of ldap_person method in Gitlab::OAuth::UserAlex Lossent2015-06-171-46/+56
| |_|/ |/| |
* | | Fix duplicate 'Email has already been taken' message when creating a userswellard2015-06-161-0/+21
|/ /
* | Merge branch 'fix-ext-issue-webbased-hooks' into 'master'Douwe Maan2015-06-161-0/+9
|\ \