summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-191-3/+3
* Gogs ImporterKim "BKC" Carlbäcker2016-12-191-1/+5
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-11-301-1/+9
|\
| * Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan2016-11-241-0/+8
| |\
| | * Add nested groups support to the routingdz-allow-nested-group-routingDmitriy Zaporozhets2016-11-231-0/+8
| * | Allow admins to stop impersonating users without e-mail addressesOren Kanner2016-11-171-1/+1
| |/
* | Remove code to clone Bitbucket repositories using SSHDouglas Barbosa Alexandre2016-11-211-1/+1
|/
* Pass `@ref` along so we know which pipeline to showLin Jen-Shin2016-10-241-1/+2
* Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-0/+4
|\
| * Handle unmatched routing with not_found methodDmitriy Zaporozhets2016-10-151-0/+4
* | Fix specsSean McGivern2016-10-131-2/+2
* | Allow setting content for resolutionsSean McGivern2016-10-131-1/+6
|/
* Fix inconsistent highlighting of already selected activity nav-linksClement Ho2016-10-051-1/+2
* remove Ability.abilitieshttp://jneen.net/2016-08-301-6/+2
* Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-251-5/+1
* Add Sentry logging to API callsadd-sentry-logging-to-apiStan Hu2016-08-241-22/+1
* State specific default sort order for issuableszs2016-08-011-56/+0
* Load Javascript U2F library selectively.Timothy Andrew2016-07-141-4/+0
* Raise a new Gitlab::Access::AccessDeniedError when permission is not enough t...Rémy Coutable2016-06-181-0/+4
* Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-171-1/+5
|\
| * Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-131-5/+17
| |\
| * \ Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-091-1/+1
| |\ \
| * | | gitlab import UI - icon, file selector, etc... Also updated font-awesome and ...James Lopez2016-04-221-1/+5
* | | | Implement @DouweM's feedback.Timothy Andrew2016-06-161-16/+6
* | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-141-0/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Add workhorse controller and API helpersDouwe Maan2016-06-061-0/+1
* | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-091-2/+13
|\ \ \ \ | |/ / /
| * | | Implement U2F registration.Timothy Andrew2016-06-061-0/+11
| * | | Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-061-2/+2
* | | | Fix rubocop spec.Timothy Andrew2016-06-031-1/+1
* | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-031-3/+3
|\ \ \ \ | |/ / /
| * | | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-021-1/+1
| |\ \ \
| | * | | Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-301-1/+1
| * | | | Add leading comment space copissue_15557Felipe Artur2016-05-311-1/+1
| |/ / /
| * | | Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-131-1/+1
| | |/ | |/|
* | | Don't look for personal access tokens in the DB when the parameter/header is ...Timothy Andrew2016-06-011-1/+1
* | | Perform private token and personal access token authentication in the same `b...Timothy Andrew2016-06-011-22/+16
* | | Reuse the private token param and header for personal access tokens.Timothy Andrew2016-05-111-1/+1
* | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-05-111-1/+1
|\ \ \ | |/ /
| * | Use sign out path only if not emptyArtem Sidorenko2016-05-031-1/+1
| |/
* | Address @DouweM's feedback on !3749.Timothy Andrew2016-04-281-1/+1
* | Refactor `authenticate_user_from_private_token!`Timothy Andrew2016-04-281-7/+1
* | Authenticate non-API requests with personal access tokens.Timothy Andrew2016-04-281-2/+17
|/
* Add Sentry program context even without a current userRobert Speicher2016-04-141-8/+10
* Include GonHelper separately and remove created_at in factoryStan Hu2016-04-141-0/+1
* Add spec for deletion of authorized OAuth2 applicationStan Hu2016-04-141-14/+0
* Add a `program` tag to Sentry Raven contextrs-sidekiq-sentry-contextRobert Speicher2016-04-091-0/+10
* Merge branch 'master' into issue_12658Douwe Maan2016-03-211-2/+0
|\
| * Use the configured Kaminari "per page" defaultrs-use-kaminari-defaultRobert Speicher2016-03-191-2/+0
* | Tweaks, refactoring, and specsDouwe Maan2016-03-201-61/+0
|/