summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* update changelogexplicit_error_ciValery Sizov2015-06-231-0/+1
* Explicit error when commit not found in the GitLab CIValery Sizov2015-06-232-2/+8
* Merge branch 'rubocop-for-tests' into 'master'Dmitriy Zaporozhets2015-06-2395-530/+583
|\
| * Fix rubocop issues after merge of recent masterDmitriy Zaporozhets2015-06-232-7/+7
| * Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-23122-616/+735
| |\
| * | 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
| * | Fix rubocop issues at feature/ directoryDmitriy Zaporozhets2015-06-229-37/+35
| * | Enable rubocop for tests tooDmitriy Zaporozhets2015-06-221-2/+0
* | | Merge branch 'identity-validation' into 'master'Dmitriy Zaporozhets2015-06-231-0/+1
|\ \ \
| * | | Validate presence of provider field in Identityidentity-validationDmitriy Zaporozhets2015-06-231-0/+1
* | | | Its 7.13 time :)Dmitriy Zaporozhets2015-06-231-1/+1
|/ / /
* | | Merge branch 'animation-sidebar' into 'master'Dmitriy Zaporozhets2015-06-234-18/+38
|\ \ \
| * | | fixed the resizing icon issueanimation-sidebarDarby2015-06-221-2/+2
| * | | Edited the CSS of header and sidebar; added a new class of logo-container to ...Darby2015-06-194-16/+36
* | | | Merge branch 'rs-dev-issue-2414' into 'master'Dmitriy Zaporozhets2015-06-237-56/+117
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use alias_attribute to define User#two_factor_enabledrs-dev-issue-2414Robert Speicher2015-06-222-38/+3
| * | | Correct AddDefaultOtpRequiredForLoginValue migrationRobert Speicher2015-06-221-1/+3
| * | | Make default value for otp_required_for_login false instead of nullRobert Speicher2015-06-204-8/+17
| * | | Add CHANGELOG entry for 2FA status and filtering in admin areaRobert Speicher2015-06-191-0/+2
| * | | Allow Admin to filter users by 2FA statusRobert Speicher2015-06-194-14/+97
* | | | Merge branch 'fix-project-icon-links' into 'master'Dmitriy Zaporozhets2015-06-236-19/+19
|\ \ \ \
| * | | | Fix avatar tests to use banana_sample.gif since SVG is not supportedStan Hu2015-06-226-19/+19
* | | | | Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-2215-45/+45
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge requests API returns closed for closed and merged for merged.revert-mr-state-namesDmitriy Zaporozhets2015-06-222-3/+3
| * | | | Fix closed merge request scope at milestone pageDmitriy Zaporozhets2015-06-221-1/+1
| * | | | Revert merge request states renamingDmitriy Zaporozhets2015-06-1914-41/+41
* | | | | Merge branch 'nginx_defaulthost_documentation' into 'master'Dmitriy Zaporozhets2015-06-223-0/+11
|\ \ \ \ \
| * | | | | fixed typoLuke Ashe-Browne2014-12-031-2/+2
| * | | | | adding notes to gitlab nginx confLuke Ashe-Browne2014-12-033-1/+12
* | | | | | Merge branch 'see-full-size-avatar' into 'master'Dmitriy Zaporozhets2015-06-221-1/+2
|\ \ \ \ \ \
| * | | | | | When we want to see the fullsize avatar of a user we can click the avatar on ...Sander Boom2015-03-211-1/+2
* | | | | | | Merge branch 'remove_unused_except' into 'master'Dmitriy Zaporozhets2015-06-221-2/+2
|\ \ \ \ \ \ \
| * | | | | | | projects doesn't seem to be a valid action in this controllerEaden2015-05-161-2/+2
* | | | | | | | Merge branch 'rs-rspec3' into 'master'Dmitriy Zaporozhets2015-06-22105-556/+662
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | 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
View Lorry Controller Status