summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-062-4/+4
|\
| * Audit log for user authenticationValery Sizov2015-07-062-4/+4
* | Merge branch 'add-irker-options' into 'master'Dmitriy Zaporozhets2015-07-061-32/+8
|\ \
| * | Add Irker service configuration optionsStan Hu2015-07-051-32/+8
| |/
* | Allow user to be blocked and unblocked via the APISteve Norman2015-07-031-0/+51
* | Add support for unlocking users in admin settingsStan Hu2015-07-021-0/+15
|/
* Refactor can_be_merged logic for merge requestDmitriy Zaporozhets2015-07-011-0/+14
* Extract the longest-matching ref from a commit path when multiple matches occurStan Hu2015-07-011-2/+9
* Merge branch 'fix-zero-sha-lookup' into 'master'Dmitriy Zaporozhets2015-07-011-0/+8
|\
| * Repository#blob_at should return nil for 00000000... shafix-zero-sha-lookupDmitriy Zaporozhets2015-07-011-0/+8
* | Merge branch 'reporter-manage-issues' into 'master'Dmitriy Zaporozhets2015-07-013-0/+36
|\ \ | |/ |/|
| * Reporter role can manage issue tracker nowreporter-manage-issuesDmitriy Zaporozhets2015-06-303-0/+36
* | Fix ApplicationHelper specsrs-fix-application-helper-specsRobert Speicher2015-06-303-102/+138
* | Add spec/support/factory_girlRobert Speicher2015-06-302-4/+6
* | 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