summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Validate presence of provider field in Identityidentity-validationDmitriy Zaporozhets2015-06-231-0/+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
| * | | | | | | 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
| * | | | | | | Bump pg gem to 0.18.2Robert Speicher2015-06-221-1/+1
| * | | | | | | Bump database_cleaner to ~> 1.4.0Robert Speicher2015-06-222-6/+3
| * | | | | | | Fix GitPushService specRobert Speicher2015-06-221-4/+6
| * | | | | | | Replace remaining references to `Note.create_cross_reference_note`Robert Speicher2015-06-229-21/+16
| * | | | | | | Use to_reference for issue and merge request mentionable specsRobert Speicher2015-06-222-4/+4
| * | | | | | | Bump rspec to 3.3.0Robert Speicher2015-06-222-30/+33
| * | | | | | | Update spec/features/security specsRobert Speicher2015-06-222-43/+26
| * | | | | | | Update email_spec gemRobert Speicher2015-06-224-5/+5
| * | | | | | | Update mock and stub syntax for specsRobert Speicher2015-06-2249-220/+283
| * | | | | | | Update and simplify Import controller specsRobert Speicher2015-06-226-36/+75
| * | | | | | | Fix include_module matcherRobert Speicher2015-06-221-1/+5
| * | | | | | | Bump poltergeist to 1.6.0Robert Speicher2015-06-222-4/+6
| * | | | | | | Fix features syntaxRobert Speicher2015-06-2213-52/+84
| * | | | | | | Upgrade to newer version of CapybaraJeroen van Baarsen2015-06-222-3/+3
| * | | | | | | Started on the actual rspec 3 upgradeJeroen van Baarsen2015-06-224-15/+18
* | | | | | | | Merge branch 'rs-remove-link-to-override'Dmitriy Zaporozhets2015-06-222-70/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove overridden `link_to` helperrs-remove-link-to-overrideRobert Speicher2015-06-172-70/+0
* | | | | | | | | Merge branch 'new-logo' into 'master'Dmitriy Zaporozhets2015-06-2213-3/+85
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Replace old logo with new onenew-logoDmitriy Zaporozhets2015-06-1913-3/+85
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'web-editor-autocrlf' into 'master'Dmitriy Zaporozhets2015-06-224-4/+10
|\ \ \ \ \ \ \ \
View Lorry Controller Status