summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-011-3/+3
|\
| * Fix typos in comments and specsGeorge Tsiolis2018-11-011-3/+3
* | Make Highlight accept language paramMark Chao2018-10-301-1/+1
|/
* Merge branch '52559-applications-api-get-delete' into 'master'Rémy Coutable2018-10-221-6/+2
|\
| * Remove useless braces !22296JB Vasseur2018-10-181-1/+1
| * Use ApplicationsFinder !22296JB Vasseur2018-10-181-6/+2
* | Remove the `ForkedProjectLink` modelBob Van Landuyt2018-10-191-2/+2
|/
* Remove Git circuit breakerZeger-Jan van de Weg2018-10-101-7/+0
* Simplify runner registration token resettingTomasz Maczukin2018-10-041-1/+2
* Remove background job throttling feature51509-remove-sidekiq-limit-fetchValery Sizov2018-09-241-2/+1
* Merge branch 'frozen-string-app-controller' into 'master'Stan Hu2018-09-2028-0/+56
|\
| * Enable frozen string in app/controllers/**/*.rbrepo-forks/gitlab-ce-frozen-string-app-controllergfyoung2018-09-1828-0/+56
* | Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'Dmitriy Zaporozhets2018-09-201-1/+31
|\ \ | |/ |/|
| * Add empty controller actions and utilize referer_path helperMartin Wortschack2018-09-191-2/+24
| * Parse request.referer properlyMartin Wortschack2018-09-181-1/+1
| * Adds empty methods for 'geo' and 'templates'Martin Wortschack2018-09-141-0/+6
| * merge master and resolve conflictsMartin Wortschack2018-09-112-6/+21
| |\
| * | use referer for redirect instead of hidden field param from partialsMartin Wortschack2018-09-101-1/+1
| * | handle redirect properlyMartin Wortschack2018-09-061-1/+3
| * | redirect to the relevant sub page after updating application settingsMartin Wortschack2018-09-051-1/+1
* | | Cleaned up CI runner administration codeYorick Peterse2018-09-141-2/+0
* | | Merge branch 'feature/runner-state-filter-for-admin-view' into 'master'Grzegorz Bizon2018-09-141-5/+4
|\ \ \
| * | | rename variable from *_cnt to *_countAlexis Reigel2018-09-121-1/+1
| * | | add sort dropdown to admin runners pageAlexis Reigel2018-08-291-1/+3
| * | | extract filter/sort/paging logic to finder classAlexis Reigel2018-08-201-5/+1
| * | | add status filter to admin runners pageAlexis Reigel2018-08-201-0/+1
| |/ /
* | | Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-1114-0/+38
| |/ |/|
* | Ask user explicitly about usage stats agreementJan Provaznik2018-09-071-5/+19
* | Move project services log to a separate fileFelipe Artur2018-09-061-1/+2
|/
* Merge branch 'frozen-string-enable-app-models' into 'master'Rémy Coutable2018-08-021-1/+3
|\
| * Enable frozen string in app/models/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-modelsgfyoung2018-07-261-1/+3
* | Merge branch 'master' into '41416-making-instance-wide-data-tools-more-access...Luke Bennett2018-07-311-1/+1
|\ \
| * | Fix /admin/jobs failing to load due to statement timeoutStan Hu2018-07-301-1/+1
* | | Create instance_statistics namespace and move convdev index and cohorts to itLuke Bennett2018-07-272-16/+0
|/ /
* | Revert "Merge branch '41416-making-instance-wide-data-tools-more-accessible' ...Sean McGivern2018-07-272-0/+16
* | Create instance_statistics namespace and move convdev index and cohorts to itLuke Bennett2018-07-262-16/+0
|/
* Updates from `rubocop -a`Lin Jen-Shin2018-07-0910-12/+12
* Fixed pagination of web hook logsYorick Peterse2018-07-031-2/+1
* Merge branch 'patch-28' into 'master'Rémy Coutable2018-06-261-1/+1
|\
| * Fix initial settings loading at the first run of GitLab installed from sourceAndrei Vukolov2018-06-251-1/+1
| * Update wrong initial setting transfer in application_settings_controller.rbAndrei Vukolov2018-06-211-1/+1
* | Bring changes from EELin Jen-Shin2018-06-252-4/+4
|/
* Rails5 fix Admin::HooksControllerJasper Maes2018-06-201-1/+1
* allow uploading favicon in appearance settingsAlexis Reigel2018-06-051-0/+9
* Improve `Ci::Runner#assign_to` to return a flag whether it succeeded or notKamil Trzciński2018-05-311-3/+1
* Fix fast admin counters not working when PostgreSQL has secondariessh-fix-admin-page-counts-take-2Stan Hu2018-05-251-0/+4
* Use ApplicationSetting.current_without_cache instead of ApplicationSetting.cu...Rémy Coutable2018-05-231-1/+1
* Fix Error 500 viewing admin page due to statement timeoutsStan Hu2018-05-161-0/+2
* Don't reset application settings oauth providers by mistakeDmitriy Zaporozhets2018-04-131-4/+7
* Don't reset application settings import sourcesDmitriy Zaporozhets2018-04-131-9/+1
View Lorry Controller Status