summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Move project activity to separate tab. Add more features to project home pageDmitriy Zaporozhets2015-07-071-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-061-1/+1
|\ | | | | | | | | | | | | | | Audit log for user authentication https://dev.gitlab.org/gitlab/gitlabhq/issues/2318 See merge request !931
| * Audit log for user authenticationValery Sizov2015-07-061-1/+1
| |
* | Add support for unlocking users in admin settingsStan Hu2015-07-021-0/+1
|/ | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9381
* Enable rack profiler by defaultDmitriy Zaporozhets2015-06-241-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor admin user pageDmitriy Zaporozhets2015-06-221-0/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move identities list to own controller actionDmitriy Zaporozhets2015-06-191-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-191-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-191-0/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use explicit if.Marin Jankovski2015-06-161-2/+3
|
* If kerberos is enabled require it.require_kerberos_when_enabledMarin Jankovski2015-06-151-0/+7
|
* Add RootControllerRobert Speicher2015-06-131-1/+1
| | | | | | This controller is now the target for `root_url`. It sub-classes DashboardController so we can render the old default without a redirect if the user hasn't customized their dashboard location.
* Fix a few remaining references to the old Theme names/IDsRobert Speicher2015-06-131-6/+7
|
* Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher2015-06-131-1/+1
| | | | | | | Now we can simply loop through all themes, among other things. This also removes the `dark_theme` / `light_theme` classes and the `theme_type` helper, since they weren't used anywhere.
* Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-131-1/+0
|
* Add Profiles::PreferencesControllerRobert Speicher2015-06-131-0/+1
|
* Ensure `session_expire_delay` field exists before accessing itrs-issue-1798Robert Speicher2015-06-131-4/+4
| | | | Closes #1798
* Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-122-2/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | Add session expiration delay configuration through UI application Setting is accessible by the administrator through the UI and defaults to 1 week (the current setting) Answers the following suggestions: * http://feedback.gitlab.com/forums/176466-general/suggestions/6210719-make-session-length-configurable * http://feedback.gitlab.com/forums/176466-general/suggestions/6730512-automatic-logout-after-a-time-being-idle See merge request !774
| * session_expire_seconds => session_expire_delaythemaze752015-06-102-3/+7
| | | | | | | | | | delay is in seconds more legible code in session_store Added `GitLab restart required` help block to session_expire_delay
| * Add session expiration delay configuration through UI applicationEric Maziade2015-06-052-1/+2
| | | | | | settings
* | Add a note that changing example configuration files requires changing ↵note_about_omnibus_changesMarin Jankovski2015-06-116-2/+17
| | | | | | | | omnibus-gitlab.
* | remove extra spaceJeroen Nijhof2015-06-091-1/+0
| |
* | update fog to 1.25.0 and add multipart upload supportJeroen Nijhof2015-06-092-0/+5
| |
* | Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'Douwe Maan2015-06-052-0/+6
|\ \ | |/ |/|
| * Add option to automatically link omniauth and LDAP identitiesAlex Lossent2015-06-032-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, a user needed to first sign in with his LDAP identity and then manually link his/her account with an omniauth identity from their profile. Only when this is done can the user authenticate with the omniauth provider and at the same time benefit from the LDAP integration (HTTPS authentication with LDAP username/password and in EE: LDAP groups, SSH keys etc.). This feature automates the process by looking up a corresponding LDAP person when a user connects with omniauth for the first time and then automatically linking the LDAP and omniauth identities (of course, like the existing allow_single_sign_on setting, this is meant to be used with trusted omniauth providers). The result is identical to a manual account link. Add config initializers for other omniauth settings.
* | Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-031-2/+2
|/
* Add an option to automatically sign-in with an Omniauth provider without ↵Alex Lossent2015-05-293-0/+8
| | | | | | | showing the GitLab sign-in page This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication.
* Merge branch 'feature/saml_support' into 'master'Douwe Maan2015-05-291-0/+9
|\ | | | | | | | | | | | | | | Add SAML support via Omniauth Split of !669, with doc See merge request !722
| * Add SAML support via OmniauthAlex Lossent2015-05-271-0/+9
| |
* | Merge branch 'rs-teaspoon' into 'master'Dmitriy Zaporozhets2015-05-292-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Teaspoon for Javascript testing Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect. See https://github.com/modeset/teaspoon See merge request !715
| * | Disable Rack::MiniProfiler for /teaspoon pathrs-teaspoonRobert Speicher2015-05-281-1/+2
| | |
| * | Remove jasmine-rails; add teaspoonRobert Speicher2015-05-282-2/+1
| |/
* | Add MergeRequests#commits action and routeRobert Speicher2015-05-291-0/+1
|/ | | | /:namespace_id/:project_id/merge_requests/:id/commits(.:format)
* Allow to configure gitlab_shell_secret locationJakub Jirutka2015-05-163-4/+9
|
* Fix.Douwe Maan2015-05-151-13/+5
|
* Improve fix.attr_encryped_no_db_connectionDouwe Maan2015-05-151-13/+12
|
* Don't require DB conncetion in AttrEncrypted.Douwe Maan2015-05-151-0/+29
|
* Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets2015-05-141-0/+5
|\ | | | | | | | | | | | | | | Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793
| * Protect OmniAuth request phase against CSRF.Douwe Maan2015-04-241-0/+5
| |
* | Improve OAuth application flash messages.Douwe Maan2015-05-131-5/+5
| |
* | Add otp_attempt to filtered parametersRobert Speicher2015-05-091-1/+1
| |
* | Render 2fa recovery codes instead of downloading itDmitriy Zaporozhets2015-05-091-1/+1
| |
* | Add support for backup codesDmitriy Zaporozhets2015-05-092-1/+6
| |
* | Fix rubocop complainDmitriy Zaporozhets2015-05-091-1/+1
| |
* | Create Two-factor authentication resource for userDmitriy Zaporozhets2015-05-091-0/+1
| |
* | Init 2 factor authentication for user modelDmitriy Zaporozhets2015-05-091-0/+4
| |
* | Merge branch 'rs-task_list' into 'master'Dmitriy Zaporozhets2015-05-081-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Use task_list gem for task lists Task Lists can now be used in comments, and they'll render in previews. :clap: Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271 See merge request !599
| * | Disable Rack::MiniProfiler for Jasmine's specs routeRobert Speicher2015-05-061-0/+1
| | |
* | | Revert "Allow to configure smtp and sendmail in gitlab.yml"Dmitriy Zaporozhets2015-05-066-89/+40
|/ /
* | Allow to configure smtp and sendmail in gitlab.ymlJakub Jirutka2015-05-066-40/+89
| |
View Lorry Controller Status