summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Fix config template from parse errorsStan Hu2015-05-031-3/+3
| |
* | Merge branch 'master' into 'master'Achilleas Pipinellis2015-05-031-0/+3
|\ \ | | | | | | | | | | | | | | | Update config.yml.example See merge request !597
| * | Update config.yml.examplewin322015-05-021-1/+4
| | |
* | | Merge branch 'restrict-signups-to-domains' into 'master'Dmitriy Zaporozhets2015-05-031-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add application setting to restrict user signups to e-mail domains This feature was requested long ago: http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains This MR is based off !253 but changed to use application settings and use wildcard strings to give more flexibility in pattern matching. Regexps seemed overkill and prone to mistakes. Also note that validation is ONLY done on creation to prevent breaking existing users who do not have a whitelisted domain. However, this allows a user to sign-up and change his/her email to a non-whitelisted domain. Screenshots: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b312046aae03971f37f4247382971fc6/image.png) ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/94bdf3ffaf37c2e8324eff83308f81f0/image.png) See merge request !598
| * | | Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature was requested long ago: http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains This MR is based off !253 but changed to use application settings and use wildcard strings to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong. Only restrict e-mail addresses upon creation
* | | | Make Reply-To config apply to change e-mail confirmation and other notificationsStan Hu2015-05-011-6/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | sent through Devise Fix test case that was passing due to a broken `around` statement. Closes #1556
* | | Merge branch 'fix-commit-data-url-generation' into 'master'Douwe Maan2015-04-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where commit data would not appear in some subdirectories Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example: https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix) The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior. * Closes #1478, #1459 * Closes https://github.com/gitlabhq/gitlabhq/issues/9037 See merge request !581
| * | | Fix bug where commit data would not appear in some subdirectoriesStan Hu2015-04-261-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a tree to be escaped automatically. Using wildcard globs prevents this behavior. Closes #1478, #1459
* | | Merge branch 'rs-issue-2269' into 'master'Dmitriy Zaporozhets2015-04-281-11/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate settings for default_url_options Closes #2269 See merge request !1797
| * | | Set default_url_options in test environments tooRobert Speicher2015-04-251-11/+9
| |/ /