summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Expand)AuthorAgeFilesLines
...
* Make Reply by email easier to configureDouwe Maan2015-10-131-1/+3
* Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-051-1/+0
* Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-resetRobert Speicher2015-09-301-0/+4
* Add support for AWS S3 Server-Side Encryption supportPaul Beattie2015-09-251-0/+1
* Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-211-2/+2
* Merge branch 'pg_dump_schema' into 'master' Dmitriy Zaporozhets2015-09-181-0/+1
|\
| * add pg_schema to backup configpg_dump_schemaValery Sizov2015-09-181-0/+1
* | Allow to disable GitLab CIKamil Trzcinski2015-09-181-0/+1
|/
* Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-161-0/+1
|\
| * Add attributes to LDAP::Config.Douwe Maan2015-09-081-0/+1
* | Revert "monkey patch of Hash"Kamil Trzcinski2015-09-141-15/+0
* | 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 gitlab.com:gitlab...Valery Sizov2015-09-141-1/+6
|\ \
| * \ Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-111-1/+6
| |\ \
| | * | 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.rouge-patchDouwe Maan2015-09-091-0/+24
| | | |/
| | * | Fix reading session_expire_delay when application settings are not yet create...Kamil Trzcinski2015-09-091-1/+6
* | | | 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
* | 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 backup-archive-p...Jacob Vosmaer2015-07-272-1/+3
|\ \ | |/
| * Merge branch 'set-omniauth-full-host' into 'master'Marin Jankovski2015-07-201-0/+1
| |\
| | * Set OmniAuth full_host parameter to ensure redirect URIs are correctStan Hu2015-07-171-0/+1
| * | Fix OAuth provider bug where GitLab would not go return to the redirect_uri a...Stan Hu2015-07-181-1/+2
| |/
* | Allow custom backup archive permissionsJacob Vosmaer2015-07-061-0/+1
|/
* Enable rack profiler by defaultDmitriy Zaporozhets2015-06-241-1/+1
* 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
* Ensure `session_expire_delay` field exists before accessing itrs-issue-1798Robert Speicher2015-06-131-4/+4
* Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-122-2/+7
|\
| * session_expire_seconds => session_expire_delaythemaze752015-06-102-3/+7
| * Add session expiration delay configuration through UI applicationEric Maziade2015-06-052-1/+2
* | Add a note that changing example configuration files requires changing omnibu...note_about_omnibus_changesMarin Jankovski2015-06-112-0/+2
* | 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
|/