summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'Dmitriy Zaporozhets2015-08-141-0/+37
|\
| * Disable internal issue tracker if external tracker in useStan Hu2015-07-171-0/+37
* | Provide more feedback what went wrong if HipChat service failed testStan Hu2015-08-121-0/+35
* | Show incompatible projects in Bitbucket import statusStan Hu2015-08-071-1/+3
* | Merge branch 'add-current-user-to-autocomplete' into 'master'Dmitriy Zaporozhets2015-08-061-0/+22
|\ \
| * | Always add current user to autocomplete controller to support filter by "Me"Stan Hu2015-08-061-0/+22
* | | Merge branch 'remove-email-from-published-keys' into 'master'Douwe Maan2015-08-061-0/+11
|\ \ \
| * | | Only publish ssh key-type and keyZeger-Jan van de Weg2015-08-041-0/+11
* | | | Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan2015-08-061-0/+20
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix errors deleting and creating branches with encoded slashesStan Hu2015-08-011-0/+20
| |/ /
* | | Add "Confirm user" button in user admin pageStan Hu2015-08-051-0/+14
|/ /
* | Merge branch 'rs-issue-2012' into 'master' Douwe Maan2015-07-241-10/+25
|\ \
| * | Make username parameter for Users#show case-insensitiveRobert Speicher2015-07-181-10/+25
| |/
* | Fix 404 error in files view after deleting the last file in a repositoryStan Hu2015-07-211-3/+26
|/
* Add support for destroying project milestonesStan Hu2015-07-171-0/+28
* Merge branch 'rs-disable-2fa-by-admin' into 'master'Dmitriy Zaporozhets2015-07-131-0/+28
|\
| * Add disable_two_factor route for Admin::UsersRobert Speicher2015-07-101-0/+28
* | Merge branch 'rs-disable-2fa' into 'master'Dmitriy Zaporozhets2015-07-131-10/+3
|\ \ | |/
| * Add User#disable_two_factor!rs-disable-2faRobert Speicher2015-07-101-10/+3
* | Better handle unknown projects and groups for autocompleteStan Hu2015-07-111-15/+63
* | Fix user autocomplete for unauthenticated users accessing public projectsStan Hu2015-07-101-0/+24
|/
* 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
|\ \
View Lorry Controller Status