summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-161-0/+1
|\ | | | | | | | | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
| * Add attributes to LDAP::Config.Douwe Maan2015-09-081-0/+1
| |
* | Revert "monkey patch of Hash"Kamil Trzcinski2015-09-141-15/+0
| | | | | | | | This reverts commit 6014019ed49295178ebd0c4ce5f6f1d210219420.
* | monkey patch of HashValery Sizov2015-09-141-0/+15
| |
* | Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of ↵Valery Sizov2015-09-141-1/+6
|\ \ | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * \ Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-111-1/+6
| |\ \ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Bump rouge to 1.10.1Stan Hu2015-09-101-24/+0
| | | |
| | * | Merge branch 'rouge-patch' into 'master'Robert Speicher2015-09-091-0/+24
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix highlighting of deleted lines in diffs. Resolves internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2498 Only needed until https://github.com/jneen/rouge/pull/297 is merged into Rouge and the gem is updated in GitLab. Forking `rouge`, releasing `gitlab-rouge` and using that gem wasn't an option, since `gollum-lib` has `rouge` as a dependency, so it would get included anyway, and which code we'd get would depend on the load order. See merge request !1267
| | | * | Fix highlighting of deleted lines in diffs.rouge-patchDouwe Maan2015-09-091-0/+24
| | | |/
| | * | Fix reading session_expire_delay when application settings are not yet ↵Kamil Trzcinski2015-09-091-1/+6
| | | | | | | | | | | | | | | | created and migrations are not yet done
* | | | fix of APIValery Sizov2015-09-141-1/+1
|/ / /
* | | remove gitlab_ci configValery Sizov2015-09-103-63/+24
| | |
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-093-4/+3
|\ \ \ | |/ /
| * | FogBugz project importJared Szechy2015-09-081-1/+1
| |/
| * Crowd integrationValery Sizov2015-09-021-1/+1
| |
| * retrieving oauth token with LDAP credentialsoauth_token_with_ldapValery Sizov2015-08-311-2/+1
| |
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-262-8/+46
|\ \ | |/
| * Only include base URL in OmniAuth full_host parameterStan Hu2015-08-232-9/+19
| | | | | | | | Closes #2335
* | Groundwork for merging CI into CEDouwe Maan2015-08-2513-44/+141
|/
* Merge branch 'master' into reply-by-emailDouwe Maan2015-08-201-0/+1
|\
| * Import sources: settings in the admin interfaceArtem Sidorenko2015-08-201-0/+1
| |
* | Changes and stuff.Douwe Maan2015-08-181-1/+1
| |
* | Reply by email POCDouwe Maan2015-08-181-0/+6
|/
* ink to configured gravatar host on profile pageBen Bodenmiller2015-08-051-0/+10
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-031-44/+0
|\
| * Bump redis-store to 1.1.6 and remove redid-store-fix-expiryredis-storeKamil Trzcinski2015-07-311-44/+0
| |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Jacob Vosmaer2015-07-272-1/+3
|\ \ | |/ | | | | backup-archive-permissions
| * Merge branch 'set-omniauth-full-host' into 'master'Marin Jankovski2015-07-201-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set OmniAuth full_host parameter to ensure redirect URIs are correct ### What does this MR do? This MR sets the OmniAuth `full_host` parameter to the configured GitLab URL to ensure the `redirect_uri` parameter is called with the right GitLab host. ### Why was this MR needed? [OmniAuth attempts to grab the request URI](http://awesomeprogrammer.com/blog/2012/12/09/dealing-with-omniauth-redirect-uri-mismatch-invalid-port-number-gotcha/) and use that. If you set up a reverse proxy that terminates SSL at the Web server layer (e.g. https://gitlab.domain.com), omniauth will use the internal URL (e.g. http://my-host:8080) in its redirect URI unless all the Web server headers are properly set (e.g. `X-Forwarded-Port`, etc.). This is easy to forget or mess up, and it's better to ensure that OmniAuth has the right value from the start. ### What are the relevant issue numbers? Closes #1967 See merge request !991
| | * Set OmniAuth full_host parameter to ensure redirect URIs are correctStan Hu2015-07-171-0/+1
| | | | | | | | | | | | Closes #1967
| * | Fix OAuth provider bug where GitLab would not go return to the redirect_uri ↵Stan Hu2015-07-181-1/+2
| |/ | | | | | | | | | | after sign-in Closes #1612
* | Allow custom backup archive permissionsJacob Vosmaer2015-07-061-0/+1
|/ | | | | This change helps system administrators who want to replicate GitLab backup files without needing root permissions.
* Enable rack profiler by defaultDmitriy Zaporozhets2015-06-241-1/+1
| | | | 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 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.
* 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-112-0/+2
| | | | | | | | omnibus-gitlab.
* | update fog to 1.25.0 and add multipart upload supportJeroen Nijhof2015-06-091-0/+1
| |
* | Add option to automatically link omniauth and LDAP identitiesAlex Lossent2015-06-031-0/+3
|/ | | | | | | | | | | | | | | 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.
* Add an option to automatically sign-in with an Omniauth provider without ↵Alex Lossent2015-05-292-0/+4
| | | | | | | 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.
* Disable Rack::MiniProfiler for /teaspoon pathrs-teaspoonRobert Speicher2015-05-281-1/+2
|
* Remove jasmine-rails; add teaspoonRobert Speicher2015-05-281-1/+1
|
* Allow to configure gitlab_shell_secret locationJakub Jirutka2015-05-162-4/+5
|
* 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
View Lorry Controller Status