summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove require_relative 'import_spec_helper'make-omniauth-tests-to-not-modify-global-stateKamil Trzcinski2016-06-086-6/+0
|
* Move ImportSpecHelper to spec/support/Kamil Trzcinski2016-06-081-0/+0
|
* Make Omniauth providers specs to not modify global configurationKamil Trzcinski2016-06-086-5/+12
|
* Merge branch 'support-fog-azure' into 'master' Rémy Coutable2016-06-082-0/+22
|\ | | | | | | | | | | | | | | Add fog-azure to supported backup list !4396 left out Azure by accident. See merge request !4444
| * Add Azure to supported backup list (left out accidentally)Stan Hu2016-06-072-0/+22
| |
* | Merge branch 'git-http-controller' into 'master' Rémy Coutable2016-06-0813-330/+653
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dismantling Grack::Auth part 1: Git HTTP clients Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/14501 This does not completely get rid of Grack::Auth yet because Git LFS support is 'behind' it and I would like to not make this MR bigger than needed. - changed tests to make HTTP requests instead of calling Rack apps - added missing test cases for Git HTTP authentication - moved Git HTTP requests into a 'normal' Rails controller See merge request !3361
| * | Add parenthesesJacob Vosmaer2016-06-081-4/+4
| | |
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-06-08394-3208/+9533
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | git-http-controller Conflicts: lib/gitlab/workhorse.rb
| * | | Remove code duplication in JwtControllerJacob Vosmaer2016-06-061-39/+1
| | | |
| * | | Fix testsJacob Vosmaer2016-06-063-22/+22
| | | |
| * | | Use public_sendJacob Vosmaer2016-06-031-2/+1
| | | |
| * | | Argh mixed up all the negativesJacob Vosmaer2016-06-031-2/+2
| | | |
| * | | Remove instances of Auth.newJacob Vosmaer2016-06-032-2/+2
| | | |
| * | | Refactor Gitlab::Auth rate limitingJacob Vosmaer2016-06-032-25/+53
| | | |
| * | | Fewer silly instance variablesJacob Vosmaer2016-06-031-11/+9
| | | |
| * | | Use #present?Jacob Vosmaer2016-06-031-1/+1
| | | |
| * | | Refactor _allowed? methods as Rémy askedJacob Vosmaer2016-06-031-15/+9
| | | |
| * | | Changes after more review from RémyJacob Vosmaer2016-06-033-24/+26
| | | |
| * | | Rename finder to find_in_gitlab_or_ldapJacob Vosmaer2016-06-025-13/+13
| | | |
| * | | Merge branch 'master' into git-http-controllerJacob Vosmaer2016-06-021580-11370/+32518
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: config/routes.rb
| * | | | Remove parallel assignmentJacob Vosmaer2016-05-031-1/+2
| | | | |
| * | | | Rubocop and whitespaceJacob Vosmaer2016-05-022-3/+3
| | | | |
| * | | | Use correct auth finderJacob Vosmaer2016-05-022-7/+2
| | | | |
| * | | | Make CI/Oauth/rate limiting reusableJacob Vosmaer2016-04-296-95/+158
| | | | |
| * | | | Specify that oauth cannot push codeJacob Vosmaer2016-04-291-0/+19
| | | | |
| * | | | More changes suggested by RémyJacob Vosmaer2016-04-251-19/+17
| | | | |
| * | | | Remove trivial 'let'Jacob Vosmaer2016-04-221-6/+5
| | | | |
| * | | | Don't mess up our parent controllerJacob Vosmaer2016-04-222-30/+28
| | | | |
| * | | | Some changes after review from Rémy and ValeryJacob Vosmaer2016-04-221-28/+33
| | | | |
| * | | | Comment and whitespaceJacob Vosmaer2016-04-151-9/+20
| | | | |
| * | | | Avoid path helper name clashJacob Vosmaer2016-04-151-4/+4
| | | | |
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-04-15241-1048/+6475
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git-http-controller
| * \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-04-12493-3595/+21341
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git-http-controller
| * | | | | | Clarify intentionsJacob Vosmaer2016-04-061-4/+7
| | | | | | |
| * | | | | | More tests, better descriptionsJacob Vosmaer2016-04-061-12/+27
| | | | | | |
| * | | | | | Move workhorse protocol code into libJacob Vosmaer2016-04-062-8/+12
| | | | | | |
| * | | | | | Delete dead codeJacob Vosmaer2016-04-061-52/+1
| | | | | | |
| * | | | | | RubocopJacob Vosmaer2016-04-061-2/+2
| | | | | | |
| * | | | | | Add some upload specsJacob Vosmaer2016-03-242-10/+89
| | | | | | |
| * | | | | | Whitespace!Jacob Vosmaer2016-03-241-2/+2
| | | | | | |
| * | | | | | Spec Www-AuthenticateJacob Vosmaer2016-03-241-0/+6
| | | | | | |
| * | | | | | Remove useless "describe"Jacob Vosmaer2016-03-241-120/+117
| | | | | | |
| * | | | | | Add test for gitlab_shell.upload_pack config settingJacob Vosmaer2016-03-241-1/+14
| | | | | | |
| * | | | | | Remove useles only:Jacob Vosmaer2016-03-241-3/+3
| | | | | | |
| * | | | | | Whitespace, remove unused methodJacob Vosmaer2016-03-241-14/+10
| | | | | | |
| * | | | | | Test both GET and POST for git-upload-packJacob Vosmaer2016-03-242-47/+69
| | | | | | |
| * | | | | | Keep Grack::Auth in the routes for LFS onlyJacob Vosmaer2016-03-241-0/+3
| | | | | | |
| * | | | | | Get Grack::Auth tests to passJacob Vosmaer2016-03-233-8/+191
| | | | | | |
| * | | | | | Test Grack::Auth via a request specJacob Vosmaer2016-03-231-90/+71
| | | | | | |
* | | | | | | Merge branch 'fix-endless-redirect' into 'master' Rémy Coutable2016-06-084-6/+37
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix endless redirections when accessing user OAuth applications when they are disabled ## What does this MR do? This MR fixes a bug where the browser would be redirect endlessly when attempting to access the user's OAuth applications when an admin has disabled this system-wide setting. ## Are there points in the code the reviewer needs to double check? I assume disabling the nav button is better than showing a page that says, "OAuth applications are disabled by the admin." ## Why was this MR needed? Lots of users were confused when they hit endless redirect errors. ## What are the relevant issue numbers? #14770 See merge request !4525
View Lorry Controller Status