summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/admin-integrations' into 'master' Sean McGivern2017-05-051-0/+2
|\
| * refactor code based on feedbackJames Lopez2017-05-051-1/+1
| * refactor code based on feedbackJames Lopez2017-05-051-1/+1
| * refactor a few things based on feedbackJames Lopez2017-05-041-1/+3
| * add propagate service worker and updated spec and controllerJames Lopez2017-05-031-1/+1
* | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-031-4/+22
|\ \ | |/
| * Implement ability to update hooksAlexander Randa2017-04-281-4/+22
* | Attempted adding separate clientside_sentry settingsLuke "Jared" Bennett2017-04-281-0/+2
|/
* Show group name on flash container when group is created from Admin areaKushal Pandya2017-04-251-1/+1
* Refactor Admin::GroupsController#members_update method and add some specsdz-refactor-admin-group-membersDmitriy Zaporozhets2017-04-201-2/+6
* Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-192-0/+24
|\
| * Use serializer for formatting cohorts dataSean McGivern2017-04-141-2/+4
| * Rename user cohorts -> cohortsSean McGivern2017-04-142-9/+9
| * Cache user cohorts results for a daySean McGivern2017-04-141-1/+3
| * Add user cohorts table to admin areaSean McGivern2017-04-142-1/+13
| * Port 'Add more usage data to EE ping' to CESean McGivern2017-04-141-0/+7
| * Port 'Add EE usage ping' to CESean McGivern2017-04-141-0/+1
* | Use DeleteUserWorker for removing users via spam logssh-use-delete-worker-spam-logsStan Hu2017-04-171-1/+1
|/
* Remove the User#is_admin? methodblackst0ne2017-04-092-2/+2
* Merge branch 'feature/enforce-2fa-per-group' into 'master' Douwe Maan2017-04-061-1/+3
|\
| * Support 2FA requirement per-groupMarkus Koller2017-04-061-1/+3
* | ProjectsFinder should handle more optionsJacopo2017-04-061-0/+1
|/
* Merge branch 'introduce-base-polling-interval' into 'master' Sean McGivern2017-04-031-0/+1
|\
| * Introduce "polling_interval_multiplier" as application settingAdam Niedzielski2017-04-031-0/+1
* | Fix a few N+1 queries identified by Bulletfix-nplusone-queriesStan Hu2017-04-021-0/+1
|/
* Handle parsing OpenBSD ps output properly to display sidekiqSebastian Reitenbach2017-03-311-1/+1
* Merge branch 'tc-cleanup-application-settings-spec' into 'master' Sean McGivern2017-03-301-9/+0
|\
| * Remove redundant code to convert restricted_levels to integersToon Claes2017-03-231-9/+0
* | Merge branch 'fix_rake_gitlab_check_sidekiq' into 'master' Rémy Coutable2017-03-291-1/+1
|\ \
| * | There might be ps utilities out there, that assume 80chars insteadSebastian Reitenbach2017-03-281-1/+1
* | | Labels support color names in backendDongqing Hu2017-03-291-4/+5
|/ /
* | Implement new service for creating userGeorge Andrinopoulos2017-03-271-8/+4
|/
* get the logic right :Xhttp://jneen.net/2017-03-091-1/+1
* consolidate the error handling for #impersonatehttp://jneen.net/2017-03-091-9/+12
* protect internal users from impersonationhttp://jneen.net/2017-03-091-0/+4
* Fix access token specsfix-specs-for-access-tokensSean McGivern2017-03-071-1/+1
* Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-071-1/+1
|\
| * Make sure scopes are loaded in admin OAuth application formMarkus Koller2017-03-071-1/+1
* | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-071-0/+53
|\ \ | |/ |/|
| * apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-061-11/+9
| * refactors finder and correlated codeTiago Botelho2017-03-011-7/+13
| * applies relevant changes to the code and code structureTiago Botelho2017-02-282-49/+49
| * refactors documentation and personal access tokens form to not allow admins t...Tiago Botelho2017-02-281-1/+2
| * add admin panel for personal access tokensSimon Vocella2017-02-281-0/+48
* | Add admin settings entriesPawel Chojnacki2017-03-061-0/+3
* | Merge branch 'dashboard-filter-search-keep-params' into 'master' Dmitriy Zaporozhets2017-03-041-0/+9
|\ \
| * | Refactor projects filtering by nameDmitriy Zaporozhets2017-03-031-0/+9
| |/
* | Bump health_check gem to version 2.6.0bump-health-check-gemDouglas Barbosa Alexandre2017-03-031-1/+1
|/
* Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-241-2/+2
|\
| * Revert "Enable Style/DotPosition"Douwe Maan2017-02-231-3/+3
View Lorry Controller Status