summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | Implement Build ArtifactsKamil Trzcinski2015-11-101-0/+1
| | | | | | | | | | | | | | - Offloads uploading to GitLab Workhorse - Use /authorize request for fast uploading - Added backup recipes for artifacts - Support download acceleration using X-Sendfile
* | Enable shared runners for all new projectsKamil Trzcinski2015-11-051-0/+1
|/
* Redirect to a default path if HTTP_REFERER is not setStan Hu2015-10-203-11/+19
| | | | | | | | | | Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731
* Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-182-2/+7
|\
| * Improve invalidation of stored service password if the endpoint URL is changedimprove_reset_service_password_v2Alex Lossent2015-10-151-1/+7
| | | | | | | | | | Password can now be specified at the same time as the new URL, and the service template admin pages now work.
| * Revert "Improve invalidation of stored service password if the endpoint URL ↵Valery Sizov2015-10-141-7/+1
| | | | | | | | | | | | is changed" This reverts commit b46397548056e4e8ef00efe4f641c61ba1dd5230.
| * Improve invalidation of stored service password if the endpoint URL is changedAlex Lossent2015-10-141-1/+7
| | | | | | | | | | It now allows to specify a password at the same time as the new URL, and works on the service template admin pages.
| * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-051-1/+0
| | | | | | | | | | | | This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe816b0c681ac218096b294311dd04fde8b
* | Send an email (to support) when a user is reported for spamJonathan Rochkind2015-10-081-0/+1
|/
* Add option to admin area to sign in as a specific userPavel Forkert2015-09-241-0/+6
| | | | Closes #2291
* Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher2015-09-191-1/+1
|
* Allow to disable GitLab CIKamil Trzcinski2015-09-181-0/+1
|
* Allow custom info to be added to Help pageJeroen van Baarsen2015-09-181-0/+1
| | | | | | Fixes #2536 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* added spinach for glabal labelsglobal_labelsValery Sizov2015-09-031-1/+0
|
* CRUD for admin labelsValery Sizov2015-09-031-0/+59
|
* Merge branch 'enable_ssl_verification_web_hook' into 'master'Dmitriy Zaporozhets2015-08-261-1/+1
|\ | | | | | | | | | | | | | | Enable SSL verification for Webhooks https://dev.gitlab.org/gitlab/gitlabhq/issues/2121 See merge request !1135
| * Enable SSL verification for Webhooksenable_ssl_verification_web_hookValery Sizov2015-08-261-1/+1
| |
* | Improve abuse reports managementDmitriy Zaporozhets2015-08-251-2/+7
|/ | | | | | | | * Link to user profile instead of user admin page * One button for remove user and report * Remove user and report with page reloading Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Import sources: settings in the admin interfaceArtem Sidorenko2015-08-201-0/+10
|
* Allow listing of archived projectsArtem Sidorenko2015-08-191-0/+1
| | | | Resolves #9285
* Add abuse report management in admin areaDmitriy Zaporozhets2015-08-061-0/+11
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add "Confirm user" button in user admin pageStan Hu2015-08-051-0/+8
| | | | | Closes #2116 Closes https://github.com/gitlabhq/gitlabhq/issues/9502
* Merge branch 'rs-disable-2fa-by-admin' into 'master'Dmitriy Zaporozhets2015-07-131-0/+6
|\ | | | | | | | | | | | | | | | | | | Allow admins to disable 2FA for a user > ![Screen_Shot_2015-07-10_at_5.19.13_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3f9bb7c783110d2689c282879cb4b061/Screen_Shot_2015-07-10_at_5.19.13_PM.png) Depends on !961 See merge request !962
| * Add disable_two_factor route for Admin::UsersRobert Speicher2015-07-101-0/+6
| |
* | Fix transferring of project to another group using the API.Douwe Maan2015-07-111-1/+2
|/
View Lorry Controller Status