summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-relative-submodule-namespace-path' into 'master'Dmitriy Zaporozhets2015-06-291-1/+1
|\
| * Fix Error 500 when relative submodule resolves to a namespace that has a diff...Stan Hu2015-06-231-1/+1
* | Remove disableButtonIf[Any]EmptyField calls from formsRobert Speicher2015-06-261-2/+0
* | Add "Requires Input" JS behaviorRobert Speicher2015-06-262-0/+67
* | Merge branch 'rename-abilities' into 'master'Dmitriy Zaporozhets2015-06-262-4/+4
|\ \
| * | Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-262-4/+4
* | | Merge branch 'rs-issue-1887' into 'master'Dmitriy Zaporozhets2015-06-261-3/+2
|\ \ \ | |/ / |/| |
| * | Fix merge request diff featuresrs-issue-1887Robert Speicher2015-06-251-3/+2
* | | Update tests and use js-issuable class for context formDmitriy Zaporozhets2015-06-264-7/+7
|/ /
* | Merge branch 'rs-random-placeholder-tip' into 'master'Dmitriy Zaporozhets2015-06-251-0/+7
|\ \
| * | Prefix random Markdown tips with "Tip:"rs-random-placeholder-tipRobert Speicher2015-06-241-1/+1
| * | Show a random Markdown tip in the textarea placeholderRobert Speicher2015-06-231-0/+7
* | | Merge branch 'add-2fa-status-to-admin-api' into 'master'Robert Speicher2015-06-241-0/+1
|\ \ \
| * | | Add 2FA status to user admin APIStan Hu2015-06-231-0/+1
| |/ /
* | | Only look up Commit authors/committers by emailrs-issue-1850Robert Speicher2015-06-231-10/+4
|/ /
* | 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