summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Enable Style/DotPosition"Douwe Maan2017-02-231-3/+3
| | | | | | | | | | | | | | | This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb
* Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-3/+3
| | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
* Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-3/+3
|
* Enable Style/MutableConstantDouwe Maan2017-02-231-2/+2
|
* Enable Style/DotPositionDouwe Maan2017-02-231-3/+3
|
* Merge branch ↵Rémy Coutable2017-02-201-0/+1
|\ | | | | | | | | | | | | | | | | | | 'fix_sidekiq_concurrency_warning_message_in_admin_background_job_page' into 'master' fix incorrect sidekiq concurrency count in admin background page Closes #19862 See merge request !9359
| * fix incorrect sidekiq concurrency count in admin background pagewendy04022017-02-191-0/+1
| |
* | exclude rpc_pipefs from system disc infoBen Bodenmiller2017-02-181-0/+1
|/
* Merge branch 'use-update-runner-service' into 'master' Kamil Trzciński2017-02-171-3/+3
|\ | | | | | | | | | | | | Prefer service object over after_save hook Closes #26921 See merge request !8664
| * Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-153-5/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (488 commits) Remove duplicate CHANGELOG.md entries for 8.16.5 Update CHANGELOG.md for 8.14.9 Update CHANGELOG.md for 8.15.6 #27631: Add missing top-area div to activity header page Update CHANGELOG.md for 8.16.5 Update CHANGELOG.md for 8.16.5 Update CHANGELOG.md for 8.16.5 Fix yarn lock and package.json mismatch caused by MR 9133 sync yarn.lock with recent changes to package.json Add changelog Fix z index bugs Add Links to Branches in Calendar Activity SidekiqStatus need to be qualified in some cases Replace static fixture for behaviors/requires_input_spec.js (!9162) API: Consolidate /projects endpoint Add MySQL info in install requirements Fix timezone on issue boards due date Use Gitlab::Database.with_connection_pool from !9192 Disconnect the pool after done Use threads directly, introduce pool later: ...
| * \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-071-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (379 commits) Fixed failing tests because list doens't exist Add changelog file Update system_note_service_spec.rb Remove noteable object in time tracking system notes [ci-skip] Make all system notes lowercase Fixed eslint Don't render snippet actions for logged-out users Remove deprecated MR and Issue endpoints and preserve V3 namespace Removed additional dropdown list animations Improve docs on CI/CD code coverage regexp setting Improve Changelog entry for CI config compatibility fix Refine docs on code coverage regexp on job level Introduce maximum session time for terminal websocket connection Add Changelog entry for CI config compatibility fix Map configuration to directory locations and add defaults to NFS HA doc. Update docs on setting up a CI/CD coverage regexp Fix Rubocop offense in legacy CI/CD config specs add CHANGELOG entry for !8988 transpile all javascript files with babel add npm run webpack command ...
| * \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-043-3/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (589 commits) Backport changes from EE squash Fix broken tests Rename Build to Job Adds changelog entry Change "Build" to "Job" in builds show page header and sidebar replace `find_with_namespace` with `find_by_full_path` PlantUML support for Markdown remove dateFormat global exception fix relative paths to xterm.js within fit.js use setFixtures instead of fixture.set prevent u2f tests from triggering a form submission while testing simplify test for focus state preload projects.json fixture preload projects.json fixture rework tests which rely on teaspoon-specific behavior Only render hr when user can't archive project. use setFixtures instead of fixture.set ensure helper classes and constants are exposed globally preload projects.json fixture fix fixture references in environments_spec allow console.xxx in tests, reorder eslint rules alphabetically ...
| * | | | Prefer service object over after_save hookLin Jen-Shin2017-01-211-3/+3
| | | | | | | | | | | | | | | | | | | | Closes #26921
* | | | | Drop theme ID from users tableAnnabel Dunstone Gray2017-02-151-1/+0
| |_|_|/ |/| | |
* | | | Merge branch 'dz-refactor-full-path' into 'master' Dmitriy Zaporozhets2017-02-082-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Store group and project full name and full path in routes table See merge request !8979
| * | | | Store group and project full name and full path in routes tabledz-refactor-full-pathDmitriy Zaporozhets2017-02-082-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix inconsistent naming for services that delete thingsdixpac2017-02-081-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | * Changed name of delete_user_service and worker to destroy * Move and change delete_group_service to Groups::DestroyService * Rename Notes::DeleteService to Notes::DestroyService
* | | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-071-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!998 See merge request !8984
| * | | Backport of the frontend view, including testsJose Ivan Vargas2017-02-061-1/+1
| | |/ | |/|
* | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-061-0/+1
|\ \ \ | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-061-0/+1
| |/ / | | | | | | | | | | | | Store the value in application settings. Expose the value to Workhorse.
* | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-032-2/+2
|\ \ \ | |/ /
| * | replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-032-2/+2
| | | | | | | | | | | | add complete changelog for !8949
* | | Add GitLab PagesKamil Trzcinski2017-01-311-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The pages are created when build artifacts for `pages` job are uploaded - Pages serve the content under: http://group.pages.domain.com/project - Pages can be used to serve the group page, special project named as host: group.pages.domain.com - User can provide own 403 and 404 error pages by creating 403.html and 404.html in group page project - Pages can be explicitly removed from the project by clicking Remove Pages in Project Settings - The size of pages is limited by Application Setting: max pages size, which limits the maximum size of unpacked archive (default: 100MB) - The public/ is extracted from artifacts and content is served as static pages - Pages asynchronous worker use `dd` to limit the unpacked tar size - Pages needs to be explicitly enabled and domain needs to be specified in gitlab.yml - Pages are part of backups - Pages notify the deployment status using Commit Status API - Pages use a new sidekiq queue: pages - Pages use a separate nginx config which needs to be explicitly added
* | EE backport for new application settings serviceOswaldo Ferreira2017-01-231-1/+5
|/
* Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+2
| | | | | | | | | | | | | | | | | | | | | This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a PlantUML diagram all we need is to include a plantuml block like: ``` [plantuml, id="myDiagram", width="100px", height="100px"] -- bob -> alice : ping alice -> bob : pong -- ``` The plantuml block is substituted by an HTML img element with *src* pointing to an external PlantUML server. This MR also add a PlantUML integration section to the Administrator -> Settings page to configure the PlantUML rendering service and to enable/disable it. Closes: #17603
* Refactor authorized params in Admin::UsersControllerrefactor-admin-controllers-paramsRémy Coutable2017-01-112-27/+32
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Refactor authorized params in Admin::GroupsControllerRémy Coutable2017-01-111-2/+6
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Refactor authorized params in Admin::ApplicationSettingsControllerRémy Coutable2017-01-111-45/+70
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-291-3/+0
|
* Fix: Admin group show page does not workfix-admin-group-pageValery Sizov2016-12-281-1/+1
|
* Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-271-2/+2
|\ | | | | | | | | | | | | Allow to add deploy keys with write-access Closes #1376 See merge request !7383
| * Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-201-1/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (538 commits) Reject blank environment vcariables in Gitlab::Git::RevList Add online terminal documentation Add changelog entry Add terminal UI and controller actions Fix specs Even out padding on plus button in breadcrumb menu Update font size of detail page header to 14px Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Fix Route#rename_children behavior Remove inline-block styling from status Add terminals to the Kubernetes deployment service Add a ReactiveCaching concern for use in the KubernetesService Add xterm.js 2.1.0 and a wrapper class to the asset pipeline Remove unnecessary hidden svg elements for icons. Fix consistent typo in environment.js Use a block to insert extra check for authenticate_build! Align milestone column header with count number Add Wiki import to BB importer Make CI badge hitboxes better match container ...
| * \ Merge CSSFilipa Lacerda2016-12-121-1/+1
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-061-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (488 commits) Merge branch 'issue_25064' into 'security' It's secret variables, not secure Fix dead links, add example of debug trace output, simplify titles Authorize users into imported GitLab project Document button secondary states. Update icons and color section Remove unused votes.scss Remove unused errors css Fixed MR widget content wrapping for XS viewports NIGNX -> Nginx Use pry-byebug instead byebug Fixed influence from other specs. Accept `issue new` as command to create an issue Update paranoia from 2.1.4 to 2.2.0. Use the pagination helper in the API Added changelog for #25221 Fixed top margin for Builds page status header information Satisfied eslint Fix compatibility with Internet Explorer 11 for merge requests change the date label to match the date used fix gfm doc typo about two spaces for next line transfer ...
| * | | | Allow admin to set keys with write access, andLin Jen-Shin2016-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show write access information when showing the key. TODO: It's ugly right now, need help!
| * | | | Don't notify user for deploy keys, feedback:Lin Jen-Shin2016-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_18517263
* | | | | Add more storage statisticsMarkus Koller2016-12-212-4/+5
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds counters for build artifacts and LFS objects, and moves the preexisting repository_size and commit_count from the projects table into a new project_statistics table. The counters are displayed in the administration area for projects and groups, and also available through the API for admins (on */all) and normal users (on */owned) The statistics are updated through ProjectCacheWorker, which can now do more granular updates with the new :statistics argument.
* | | | Implement minor changes from @dbalexandre's review.Timothy Andrew2016-12-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Mainly whitespace changes. - Require the migration adding the `scope` column to the `personal_access_tokens` table to have downtime, since API calls will fail if the new code is in place, but the migration hasn't run. - Minor refactoring - load `@scopes` in a `before_action`, since we're doing it in three different places.
* | | | Allow creating personal access tokens / OAuth applications with scopes.Timothy Andrew2016-12-161-1/+5
| |_|/ |/| |
* | | Add nested groups support on data leveldz-nested-groupsDmitriy Zaporozhets2016-12-081-1/+1
| |/ |/| | | | | | | | | | | | | * add parent_id field to namespaces table to store relation with nested groups * create routes table to keep information about full path of every group and project * project/group lookup by full path from routes table Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emailsRuben Davila2016-11-281-0/+1
|/ | | | | | This new global setting will allow admins to specify if HTML emails should be sent or not, this is basically useful when system administrators want to save some disk space by avoiding emails in HTML format and using only the Plain Text version.
* Allow the Sidekiq queues to throttle and the factor by which to throttle ↵Patricio Cano2016-11-101-1/+3
| | | | them to be configurable
* Allow certain Sidekiq jobs to be throttledPatricio Cano2016-11-101-0/+1
|
* Refine Git garbage collectionJacob Vosmaer2016-11-041-0/+5
|
* Allow multiple repository storage shards to be enabled, and automatically ↵Nick Thomas2016-11-041-1/+1
| | | | round-robin between them
* Allow to search for user by secondary email address in the admin interfaceYar2016-11-011-1/+1
| | | | | | | | | | It is not possible to search for a user by his secondary email address in the Users search bar in the admin interface(/admin/users). A use-case could be that an admin wants to remove a specific secondary email address of an user, because it interferes with another user. Issue #23761 This commit adds ability to search not only by main email, but also by any secondary email in the admin interface.
* Rename :name search parameter to :search_query at /admin/usersYar2016-11-011-1/+1
| | | | | | The parameter is used to search users by several criretia was called :name. This request renames it to :search_query which closer to it actual perpose
* Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (292 commits) Deletes extra empty line breaking the build Optimize the `award_user_list` helper spec Fix typo and add he MWBS accronym for "Merge When Build Succeeds" Added missing content and improved layout ExpireBuildArtifactsWorker query builds table without ordering enqueuing one job per build to cleanup Improve the contribution and MR review guide Updates test in order to look for link Make projects API docs match parameter style Fix Event#reset_project_activity updates Update user whitelist reject message Call ensure_secret_token! in secret token test's before block since it would be called in an initializer. Add a CHANGELOG for CacheMarkdownField Enable CacheMarkdownField for the remaining models Make search results use the markdown cache columns, treating them consistently Use CacheMarkdownField for notes Add markdown cache columns to the database, but don't use them yet Update issue board spec Link to Registry docs from project settings Truncate long labels with ellipsis in labels page Improve issue load time performance by avoiding ORDER BY in find_by call ...
| * Enable CacheMarkdownField for the remaining modelsNick Thomas2016-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit alters views for the following models to use the markdown cache if present: * AbuseReport * Appearance * ApplicationSetting * BroadcastMessage * Group * Issue * Label * MergeRequest * Milestone * Project At the same time, calls to `escape_once` have been moved into the `single_line` Banzai pipeline, so they can't be missed out by accident and the work is done at save, rather than render, time.