summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Add User#disable_two_factor!rs-disable-2faRobert Speicher2015-07-101-10/+3
* Return 40x error codes if branch could not be deleted in UIStan Hu2015-07-061-0/+26
* Add support for unlocking users in admin settingsStan Hu2015-07-021-0/+15
* Fix error when deleting a user who has projectsStan Hu2015-06-231-0/+24
* Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-239-46/+85
|\
| * Change `to_not` calls to `not_to`Robert Speicher2015-06-222-8/+8
| * Update mock and stub syntax for specsRobert Speicher2015-06-221-3/+3
| * Update and simplify Import controller specsRobert Speicher2015-06-226-36/+75
* | Fix Style/AlignHash cop violationsStan Hu2015-06-229-62/+139
* | Fix Style/Blocks cop violationsRobert Speicher2015-06-224-34/+23
* | Fix Style/SpaceInsideHashLiteralBraces cop violationsRobert Speicher2015-06-221-1/+1
|/
* Merge branch 'rs-dev-issue-2355' into 'master'Dmitriy Zaporozhets2015-06-221-15/+64
|\
| * Load the Merge Request > Commits tab lazilyRobert Speicher2015-06-171-15/+64
| * Move Projects::MergeRequestsController spec to its correct locationRobert Speicher2015-06-171-0/+0
* | Use User#two_factor_enabled instead of otp_required_for_loginrs-dev-issue-2415Robert Speicher2015-06-191-4/+4
* | Fix 403 Access Denied error messages when accessing Labels section in a proje...Stan Hu2015-06-181-0/+40
|/
* Merge branch 'rs-dev-issue-2228' into 'master'Dmitriy Zaporozhets2015-06-152-0/+120
|\
| * Spec the failure cases for PreferencesController#updateRobert Speicher2015-06-131-2/+18
| * Add RootControllerRobert Speicher2015-06-131-0/+32
| * Add `dashboard` attribute to User modelRobert Speicher2015-06-131-0/+2
| * Add Profiles::PreferencesControllerRobert Speicher2015-06-131-0/+70
* | Change `foo.should` syntax to `expect(foo).to` in specsRobert Speicher2015-06-131-8/+8
|/
* Bump secret key length to 32rs-manual-2fa-entryRobert Speicher2015-05-231-1/+1
* Add support for manually entering 2FA detailsRobert Speicher2015-05-231-2/+5
* Merge branch 'fix-avatar-removal' into 'master'Hannes Rosenögger2015-05-123-0/+52
|\
| * Fix bug where avatar filenames were not actually deleted from the database du...Stan Hu2015-05-073-0/+52
* | Clear all 2FA-related fields when user disables the featureRobert Speicher2015-05-091-0/+126
|/
* Merge branch 'fix-escaped-branches-in-compare' into 'master'Douwe Maan2015-05-041-0/+22
|\
| * Unescape branch names in compare commitStan Hu2015-04-301-0/+22
* | Merge branch 'show-invalid-projects-google-code-import' into 'master'Douwe Maan2015-04-301-0/+13
|\ \
| * | Show incompatible projects in Google Code import statusStan Hu2015-04-301-0/+13
| |/
* | Fix "Revspec not found" errors when viewing diffs in a forked project with su...Stan Hu2015-04-271-0/+20
|/
* Use project.commit convenience method.Douwe Maan2015-04-241-1/+1
* Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master'Dmitriy Zaporozhets2015-04-201-0/+223
|\
| * Add tests.Douwe Maan2015-04-171-0/+223
* | Re-fix image rendering for help pagesRobert Speicher2015-04-151-0/+61
|/
* Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-151-0/+47
|\
| * Allow projects to be imported from Google Code.Douwe Maan2015-04-031-0/+47
* | Render a 404 when RefsController#logs_tree gets an HTML requestRobert Speicher2015-04-061-0/+41
|/
* Merge branch 'import-current-user' into 'master'Dmitriy Zaporozhets2015-04-023-34/+281
|\
| * Add tests.import-current-userDouwe Maan2015-04-013-34/+281
* | Merge branch 'repository-archive-worker' into 'master'Dmitriy Zaporozhets2015-04-021-0/+65
|\ \
| * | Add tests.Douwe Maan2015-03-311-0/+65
| |/
* | Merge branch 'group-information-leak' into 'master'Dmitriy Zaporozhets2015-04-011-0/+121
|\ \ | |/ |/|
| * Add tests.group-information-leakDouwe Maan2015-03-271-0/+121
* | Add autocomplete controllerDmitriy Zaporozhets2015-03-261-0/+51
|/
* Fix user controller specsDmitriy Zaporozhets2015-03-221-17/+4
* Extend the commit calendar to show the actual commits for a dateHannes Rosenögger2015-03-181-8/+40
* Merge branch 'github-org-repos' into 'master'Dmitriy Zaporozhets2015-03-121-2/+5
|\
| * Fix missing GitHub organisation repositories on import page.Douwe Maan2015-03-121-2/+5