summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into issue_12658Douwe Maan2016-03-213-7/+7
|\ | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
| * Use the configured Kaminari "per page" defaultrs-use-kaminari-defaultRobert Speicher2016-03-193-7/+7
| |
* | Add specs and add visibility level to admin groupsFelipe Artur2016-03-211-1/+1
| |
* | Fix some specsDouwe Maan2016-03-201-1/+0
| |
* | Merge branch 'master' into issue_12658Douwe Maan2016-03-202-3/+3
|\ \ | |/
| * Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-171-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
| * | Clearify who deletes the userZeger-Jan van de Weg2016-03-151-1/+1
| | |
| * | Fix broken specsZeger-Jan van de Weg2016-03-151-1/+1
| | |
| * | Add ability to delete a user with forceZeger-Jan van de Weg2016-03-151-1/+1
| | |
| * | A worker deletes a user, so the request doesn't time outZeger-Jan van de Weg2016-03-151-1/+1
| | | | | | | | | | | | Fixes #13261
* | | Merge 4009-external-users into issue_12658Felipe Artur2016-03-161-1/+1
|\ \ \ | | |/ | |/|
| * | External UsersZeger-Jan van de Weg2016-03-131-1/+1
| |/ | | | | | | | | The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.
* | Prevent projects to have higher visibility than groupsFelipe Artur2016-03-101-0/+1
|/ | | | | | Prevent Groups to have smaller visibility than projects Add default_group_visibility_level to configuration Code improvements
* Remove instance variable @group multiple assignmentYatish Mehta2016-03-081-1/+1
|
* Branded login page also in CE11489-branded-appearance-to-ceZeger-Jan van de Weg2016-02-261-0/+57
| | | | | The only major difference with the EE version is the change from a light and dark logo to only a header logo The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
* Label description and Label rowTap2016-02-171-1/+1
| | | | | - Add label description - Show label row when filtering issues or merge requests by label
* Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mailJason Lee2016-02-091-0/+1
|
* Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-061-0/+4
| | | | Closes #11853
* Improve admin broadcast messages pageDmitriy Zaporozhets2016-02-051-1/+1
| | | | | | | * Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor Admin::SpamLogsController to block user before destroyingDouglas Barbosa Alexandre2016-02-021-23/+7
|
* Support Akismet spam checking for creation of issues via APIStan Hu2016-02-022-0/+35
| | | | | | | Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
* Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-281-2/+0
| | | | | This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
* Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-201-0/+2
|\ | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515
| * Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-201-0/+2
| |
* | Add sentry integrationJeroen Nijhof2016-01-181-0/+2
|/
* Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-142-1/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP Sync blocked user edgecases Allow GitLab admins to block otherwise valid GitLab LDAP users (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462) Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other. Expected behavior: - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?` - [x] "ldap_blocked" users can't be unblocked by the Admin UI - [x] "ldap_blocked" users can't be unblocked by the API - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked" - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked` Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users: ![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png) There will be another MR for the EE version. See merge request !2242
| * Code style fixes and some code simplifiedGabriel Mazetto2016-01-081-2/+2
| |
| * Repair ldap_blocked state when no ldap identity exist anymoreGabriel Mazetto2016-01-081-0/+2
| |
| * Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-081-1/+3
| |
* | Broadcast Messages can now be editedRobert Speicher2016-01-131-5/+17
| | | | | | | | Closes #3046
* | Remove alert_type attribute from BroadcastMessageRobert Speicher2016-01-131-4/+7
| |
* | Merge branch 'configure-randomize-metrics-sample-interval' into 'master' Yorick Peterse2016-01-131-0/+1
|\ \ | | | | | | See merge request !2406
| * | Make the metrics sampler interval configurableYorick Peterse2016-01-131-0/+1
| |/
* | Block the reported user before destroying the recordrs-block-user-before-removalRobert Speicher2016-01-121-4/+2
|/ | | | | | | | This is intended to prevent the user from creating new objects while the transaction that removes them is being run, resulting in objects with nil authors which can then not be edited. See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117
* Remove InfluxDB username/passwordremove-influxdb-credentialsYorick Peterse2016-01-061-2/+0
| | | | | InfluxDB over UDP doesn't use authentication, thus there's no need for these settings.
* Show 'All' tab by default in the builds pageshow-all-builds-by-defaultDouglas Barbosa Alexandre2016-01-041-3/+3
|
* Write to InfluxDB directly via UDPYorick Peterse2015-12-291-1/+1
| | | | | | | | | | | | | This removes the need for Sidekiq and any overhead/problems introduced by TCP. There are a few things to take into account: 1. When writing data to InfluxDB you may still get an error if the server becomes unavailable during the write. Because of this we're catching all exceptions and just ignore them (for now). 2. Writing via UDP apparently requires the timestamp to be in nanoseconds. Without this data either isn't written properly. 3. Due to the restrictions on UDP buffer sizes we're writing metrics one by one, instead of writing all of them at once.
* reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-281-0/+3
|
* Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settingsYorick Peterse2015-12-281-0/+8
|
* Add to application_settings forced TFA optionsGabriel Mazetto2015-12-241-0/+2
|
* Allow admin to create new user identitiesDrew Blessing2015-12-151-1/+16
|
* Use a new admin runners path when reseting runners tokenGrzegorz Bizon2015-12-141-1/+1
|
* Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-143-0/+121
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (66 commits) Fix runners admin view Fix migrations Rename mention of gitlab-git-http-server to gitlab-workhorse Bump Redis requirement to 2.8 for Sidekiq 4 requirements Fix wording on runner setup page add details on how to change saml button label Fix tests Move awards back to gray panel and few improvements to sidebar Few UI improvements to new sidebar implementation Fix tests for new issuable sidebar Update changelog Implement new sidebar for merge request page Make edit link on issuable sidebar works Redesign issue page for new sidebar Move awards css to separate file Implement issuable sidebar partial Update CHANGELOG Clarify cache behavior Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git ... Conflicts: db/schema.rb
| * Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-111-2/+2
| |
| * Migrate CI::Project to ProjectKamil Trzcinski2015-12-113-0/+121
| |
* | Add CI runners registration token reset buttonGrzegorz Bizon2015-12-111-0/+6
|/
* Be more explicit with the impersonate return URLAndrew Tomaka2015-12-021-1/+1
|
* Prevent impersonation if blockedAndrew Tomaka2015-12-021-5/+11
|
* Merge branch 'impersonate' into 'master' Dmitriy Zaporozhets2015-11-143-6/+38
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor login as to be impersonation with better login/logout Modifies the existing "login as" feature to be called impersonation. This also adds: * Application keep track of who is impersonating the user so they can revert back to the original user without having to log out. * Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop. ## Screenshots: ![](http://sindacio.us/i/2015-10-28_17-52-41.png) ![](http://sindacio.us/i/2015-10-28_17-53-08.png) See merge request !1702
| * refactor login as to be impersonation with better login/logoutJames Newton2015-10-293-6/+38
| | | | | | | | | | | | Modifies the existing "login as" feature to be called impersonation, as well as keeping track of who is impersonating to revert back to that user without having to log out.