summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Collapse)AuthorAgeFilesLines
* Further refactor and syntax fixes.Patricio Cano2016-08-151-3/+2
|
* Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-151-3/+1
| | | | - Refactored SpamCheckService into SpamService
* Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-151-2/+9
| | | | | - Added `submitted_as_ham` to `SpamLog` to mark which logs have been submitted to Akismet. - Added routes and controller action.
* Refactored spam related code even furtherPatricio Cano2016-08-151-0/+6
| | | | | | | - Removed unnecessary column from `SpamLog` - Moved creation of SpamLogs out of its own service and into SpamCheckService - Simplified code in SpamCheckService. - Moved move spam related code into Spammable concern
* Fix bug where destroying a namespace would not always destroy projectsStan Hu2016-08-111-2/+2
| | | | | | | | | | | | | | | | | | | There is a race condition in DestroyGroupService now that projects are deleted asynchronously: 1. User attempts to delete group 2. DestroyGroupService iterates through all projects and schedules a Sidekiq job to delete each Project 3. DestroyGroupService destroys the Group, leaving all its projects without a namespace 4. Projects::DestroyService runs later but the can?(current_user, :remove_project) is `false` because the user no longer has permission to destroy projects with no namespace. 5. This leaves the project in pending_delete state with no namespace/group. Projects without a namespace or group also adds another problem: it's not possible to destroy the container registry tags, since container_registry_path_with_namespace is the wrong value. The fix is to destroy the group asynchronously and to run execute directly on Projects::DestroyService. Closes #17893
* Profile requests when a header is passedfeature/profile-requests-conditionallyAhmad Sherif2016-07-261-0/+17
|
* Merge branch 'email-domain-blacklist' into 'master' Robert Speicher2016-07-201-1/+5
|\ | | | | | | | | | | | | | | | | | | | | Added the ability to block sign ups using a domain blacklist. As part of this MR, I restructured the Application Settings form to separate **Sign up** related settings from **Sign in** related settings and make everything cleaner and easier to read. Fixes #19749 Related to #5573 See merge request !5259
| * Reorder allowed params for `ApplicationSetting` and add more details to docs.email-domain-blacklistPatricio Cano2016-07-191-3/+3
| |
| * Refactor and rename `restricted_signup_domains` to `domain_whitelist` to ↵Patricio Cano2016-07-181-1/+1
| | | | | | | | better conform to its behavior and newly introduced behavior.
| * Added the ability to block sign ups using a domain blacklist.Patricio Cano2016-07-181-0/+4
| |
* | Merge branch 'issue_8110' into 'master' Rémy Coutable2016-07-201-12/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow slack service to send messages on different channels closes #8110 ## Allow slack service to send messages on different channels ![new_slack_service](/uploads/87de0bd6b02a4f7853358676b5e74dff/new_slack_service.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5124
| * | Refactor service settings viewissue_8110Felipe Artur2016-07-201-1/+1
| | |
| * | Add project service documentation and update integration documentationFelipe Artur2016-07-191-14/+2
| | |
| * | Allow slack service to send messages on different channelsFelipe Artur2016-07-191-2/+5
| |/
* | Allow to disable user request access to groups/projectsFelipe Artur2016-07-201-1/+1
|/
* Add Pending Tab to Admin BuildsKatarzyna Kobierska2016-07-181-1/+3
| | | | | | Add Pending Tab to Project Builds Update CHANGELOG
* Merge branch 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-081-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added setting to set new users by default as external ## What does this MR do? This implements the feature request #14508. It adds an option in the application settings to set new users by default as external. ## Are there points in the code the reviewer needs to double check? Everything. Like I mentioned in the discussion of the issue my knowledge of Ruby basically doesn't exists. I tested it on my machine and it seems to work, but as I am very unexperienced in Ruby I highly recommend to take a close look at the code. ## Why was this MR needed? It was requested by @DouweM to work on the issue with the proposed changes by me. ## What are the relevant issue numbers? This MR is for the issue #14508 that followed up after the implementation of #4009. See merge request !4545
| * Added setting to set new users by default as externalDravere2016-07-071-0/+1
| | | | | | | | | | | | As requested by the issue #14508 this adds an option in the application settings to set newly registered users by default as external. The default setting is set to false to stay backward compatible.
* | Revert "Revert "Merge branch 'issue_3946' into 'master' ""Robert Speicher2016-07-071-2/+3
| | | | | | | | This reverts commit bf2a86b73cce332ff8f4392ffc8df501193f32ec.
* | Revert "Merge branch 'issue_3946' into 'master' "Robert Speicher2016-07-071-3/+2
| | | | | | | | | | This reverts commit 68155ee73b549a4f79744bb325542c29d45c71ea, reversing changes made to 7ebd011ed1de7aee706f07a53c63c90f1c8aa5d4.
* | Layout for Users Groups and Projects on admin areaAlfredo Sumaran2016-07-071-2/+3
|/
* Rebasing caused `enabled_git_access_protocol` to become plural. Fixed here.Patricio Cano2016-07-051-1/+1
|
* Add setting that allows admins to choose which Git access protocols are enabledPatricio Cano2016-07-051-0/+1
|
* Merge branch 'explicit-requesters-scope' into 'master' Douwe Maan2016-07-012-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude requesters from Project#members, Group#members and User#members ## What does this MR do? It excludes requesters from the `Project#members`, `Group#members` and `User#members` associations, and adds new `Project#requesters` and `Group#requesters` associations. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Without this, if you call `project.members`, requesters are included in the results! This is at best misleading, and at worst can lead to security issues. By excluding requesters from the `#members` associations, we avoid introducing security inadvertently since you have to call the `#requesters` association explicitly to get requesters. ## What are the relevant issue numbers? This is something I realized while fixing the security issue #19102. ## Does this MR meet the acceptance criteria? - [x] I don't think this needs a CHANGELOG since this is an internal change - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4946
| * Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-012-1/+3
| | | | | | | | | | | | And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-011-1/+0
|/
* Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-07-012-0/+60
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable-shared-runners-with-admins * upstream/master: (120 commits) Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9. Remove additional entries from CHANGELOG Catch permission denied errors and ignore the disk Remove coveralls lines Make GH one-off auth the default again for importing GH projects Import from Github using Personal Access Tokens. Remove hardcoded gitlab-shell version in test env now that the required tag is published Updated breakpoint for sidebar pinning Expire branch/tag git data when needed. Remove unnecessary parens Enable Style/UnneededCapitalW Rubocop cop Expiry date on pinned nav cookie Fix broken spec in git_push_service_spec by stubbing an external issue tracker Handle external issues in IssueReferenceFilter Move Changelog entry for build retry fix to 8.9.4 Add Changelog entry for build sidebar retry link fix Improve method that tells if build is retryable Do not show build retry link when build is active Remove coveralls as its unused Move changelot item "Add sub nav to file page view" to 8.9.4 ...
| * Catch permission denied errors and ignore the diskimprove-system-infoJosh Frye2016-06-301-11/+38
| |
| * Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-301-3/+22
| |\ | | | | | | | | | | | | | | | | | | Loop all disks when displaying system info. Closes #18886 See merge request !4983
| | * Loop all disks when displaying system infoissue-18886Josh Frye2016-06-291-3/+22
| | |
| * | Add Application Setting to configure default Repository Path for new projectsshards-configAlejandro Rodríguez2016-06-291-0/+1
| |/
| * Change load average to cpu/cores on system info.Josh Frye2016-06-281-1/+2
| |
| * Use number_to_human_size for system info and remove dependency on Filesize gem.Josh Frye2016-06-281-4/+4
| |
| * Round figures for system infoJosh Frye2016-06-281-4/+4
| |
| * Show basic system info on admin panel. Closes #18886Josh Frye2016-06-281-0/+12
| |
* | Allow admins to assign locked runners:Lin Jen-Shin2016-06-281-2/+0
| | | | | | | | | | | | And show information about locked status. Help! This looks bad :o
* | Admin should be able to turn shared runners into specific ones:Lin Jen-Shin2016-06-281-1/+1
|/ | | | | | | | | | | | | | The regression was introduced by: https://gitlab.com/gitlab-org/gitlab-ce/commit/1b8f52d9206bdf19c0dde04505c4c0b1cf46cfbe I did that because there's a test specifying that a shared runner cannot be enabled, in the API. So I assume that is the case for non-admin, but admins should be able to do so anyway. Also added a test to make sure this won't regress again. Closes #19039
* Merge branch 'dz-fix-appearance-preview' into 'master' Jacob Schatz2016-06-211-0/+1
|\ | | | | | | | | | | | | Fix admin appearance settings preview Render appearance settings preview in devise layout instead of implementing it 2 times. See merge request !4792
| * Fix admin appearance settings previewdz-fix-appearance-previewDmitriy Zaporozhets2016-06-201-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Admin::RunnerProjectsController#index is not usedremove-admin-runner-projectsLin Jen-Shin2016-06-171-5/+0
| |
* | Fix typo. It's ivar and the column was called lockedLin Jen-Shin2016-06-161-1/+1
| | | | | | | | Again! For admin.
* | Return the association and check it in controller instead:Lin Jen-Shin2016-06-141-1/+3
| | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4641#note_12444891
* | Avoid enabling locked runners. Give 403 in this caseLin Jen-Shin2016-06-141-0/+2
|/
* Allow custom text on 'almost there' pageSean McGivern2016-06-081-0/+1
| | | | | | | | Add a new application setting, after_sign_up_text. This is text to be rendered as Markdown and shown on the 'almost there' page after a user signs up, but before they've confirmed their account. Tweak the styles for that page so that centered lists look reasonable.
* Add Application Setting to configure Container Registry token expire delay ↵Kamil Trzcinski2016-05-311-0/+1
| | | | (default 5min)
* Minor runner-related code refactoringsGrzegorz Bizon2016-05-191-9/+10
|
* Display validation errors when admin edits a runnerGrzegorz Bizon2016-05-191-10/+16
|
* Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'Dmitriy Zaporozhets2016-05-185-5/+5
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Change deprecated usage of rendering without response bodyMehmet Emin İNAÇ2016-03-165-5/+5
| | | | | | | | | | `render nothing: true` has been deprecated. For more information see [pr](https://github.com/rails/rails/pull/20336)
* | Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-161-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
View Lorry Controller Status