summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fix error when deleting a user who has projectsStan Hu2015-06-231-0/+24
* Merge branch 'rubocop-for-tests' into 'master'Dmitriy Zaporozhets2015-06-2385-491/+548
|\
| * Fix rubocop issues after merge of recent masterDmitriy Zaporozhets2015-06-232-7/+7
| * Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-2380-457/+521
| |\
| * | Fix Style/NonNilCheck cop violationsrubocop-for-testsStan Hu2015-06-221-1/+1
| * | Fix Style/IndentationWidth cop violationsStan Hu2015-06-224-8/+8
| * | Fix Style/CaseIndentation cop violationsStan Hu2015-06-221-10/+10
| * | Fix Style/AlignHash cop violationsStan Hu2015-06-2215-80/+178
| * | Fix bad multi-line split from previous commitRobert Speicher2015-06-221-1/+2
| * | Fix Style/Blocks cop violationsRobert Speicher2015-06-2234-213/+197
| * | Fix Style/CommentIndentation cop violationRobert Speicher2015-06-221-7/+7
| * | Fix Style/HashSyntax violationsRobert Speicher2015-06-223-3/+3
| * | Fix Style/Not cop violationsRobert Speicher2015-06-221-2/+2
| * | Fix Style/AsciiComments cop violationRobert Speicher2015-06-221-1/+1
| * | Fix Style/SpaceInsideHashLiteralBraces cop violationsRobert Speicher2015-06-2218-45/+45
| * | Fix Style/TrailingBlankLines cop violationsRobert Speicher2015-06-2212-26/+1
| * | Fix Style/IndentationConsistency cop violationsRobert Speicher2015-06-223-7/+5
| * | Fix part of api specs for rubocopDmitriy Zaporozhets2015-06-224-84/+84
| * | Remove unnecessary whitespace between let and (Dmitriy Zaporozhets2015-06-227-19/+19
* | | Merge branch 'rs-dev-issue-2414' into 'master'Dmitriy Zaporozhets2015-06-232-36/+78
|\ \ \ | |_|/ |/| |
| * | Use alias_attribute to define User#two_factor_enabledrs-dev-issue-2414Robert Speicher2015-06-221-24/+0
| * | 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
View Lorry Controller Status