summaryrefslogtreecommitdiff
path: root/config/application.rb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rel-url-fix' into 'master'Douwe Maan2016-03-011-8/+0
| | | | | | | | | | | | | | | | | | Fix relative URL See https://github.com/gitlabhq/gitlabhq/issues/10053 1. Same configuration way for relative URL like with Omnibus 2. Loading the relative configuration from Rakefile as Rails do not load initializers for `asset:precompile` First point has another positive side effect: no collisions (due to git controlled `application.rb`) any more during the upgrades of source based installations and relative url configuration - [x] tests on the source based installation - [x] tests on the centos&ubuntu omnibus packages Fixes: gitlab-org/gitlab-ce#13730, gitlab-org/gitlab-ce#13727, gitlab-org/omnibus-gitlab#1143 and https://github.com/gitlabhq/gitlabhq/issues/10053 See merge request !2979
* Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-191-2/+2
| | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
* Merge branch 'cache-clear' into 'master' Robert Speicher2016-02-191-1/+3
| | | | | | | | | Use SCAN during 'rake cache:clear' This allows 'rake cache:clear' to delete millions of keys without choking. It requires Redis 2.8.0 or newer but we needed that already anyway. See merge request !2872
* Merge branch 'doc_relative_url' into 'master' Achilleas Pipinellis2016-02-101-11/+5
|\ | | | | | | | | | | | | Add documentation on relative URL support closes #12773 See merge request !2770
| * Fix typos and grammarAchilleas Pipinellis2016-02-101-1/+2
| | | | | | | | [ci skip]
| * Edit configuration files for relative URL supportAchilleas Pipinellis2016-02-091-11/+4
| | | | | | | | [ci skip]
* | Filter out variables from production logsKamil Trzcinski2016-02-091-1/+1
|/ | | | This prevents leakage of CI Secure Variables
* Migrate mailers to ActiveJobValery Sizov2015-11-261-0/+4
|
* Use `methods: :any` in our rack-cors configurationrs-update-rack-corsRobert Speicher2015-10-071-1/+1
| | | | | This was added in rack-cors 0.4.0 and allows all types of CORS requests to the API.
* Expire Rails cache entries after two weeksJacob Vosmaer2015-07-151-0/+1
| | | | This should help prevent endless Redis growth.
* Add otp_attempt to filtered parametersRobert Speicher2015-05-091-1/+1
|
* Allow smb:// links in Markdown text.Douwe Maan2015-03-101-0/+2
|
* Filter private_token and password_confirmation params from logs.Douwe Maan2015-02-061-1/+1
| | | | Closes #1770.
* use new hash syntaxFred Chasen2015-01-231-4/+4
|
* Split up line and use single qoutes to declare Cors settingsFred Chasen2015-01-231-1/+4
|
* Expose Link header in CORS Api callsFred Chasen2015-01-231-1/+1
|
* Append in place for strings and arraysCiro Santilli2015-01-011-6/+6
|
* Use new gitlab-shell v2.3.0Dmitriy Zaporozhets2014-11-181-0/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Revert "gitlab shell works if multiple rubies installed"Dmitriy Zaporozhets2014-11-181-2/+0
| | | | This reverts commit 533f4cdf30b38c587f7a91f0dfd898b907ecd944.
* gitlab shell works if multiple rubies installedCiro Santilli2014-11-181-0/+2
| | | | | | | | | | | | Before this it would fail because git hooks automatically prepend things to the path, which can lead the wrong Ruby version to be called in which dependencies are not installed. To make sure that this is correct, the forked_merge_requests commented out test that depends on this change was uncommented. For that test to pass, it is also necessary to setup the mock server on port 3001 under test_env.rb.
* Merge pull request #8122 from bbodenmiller/cleanup-time-zoneDmitriy Zaporozhets2014-10-301-5/+0
|\ | | | | cleanup time zone settings
| * cleanup time zone settingsBen Bodenmiller2014-10-211-5/+0
| | | | | | time zone settings moved to gitlab.yml in https://github.com/gitlabhq/gitlabhq/pull/8015
* | Merge pull request #7994 from cirosantilli/rm-unneeded-autoload-pathDmitriy Zaporozhets2014-10-221-1/+0
|\ \ | |/ |/| Remove unneeded app/finders config.autoload path
| * Remove unneeded app/finders config.autoload pathCiro Santilli2014-10-071-1/+0
| | | | | | | | Every directory under app/ is searched by default
* | Add timezone configuration to gitlab.ymlSullivan SENECHAL2014-10-211-0/+1
|/
* Remove I18n.enforce_available_locales deprecation messageremove-annoying-i18n-deprecationDmitriy Zaporozhets2014-10-011-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move hook models in separate dirDmitriy Zaporozhets2014-09-151-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Huge replace of old users_project and users_group referencesDmitriy Zaporozhets2014-09-141-1/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move cache setup to config/application.rbJacob Vosmaer2014-08-291-0/+19
| | | | | | | | | Before this change we were trying to configure Rails.cache in an initializer. It seems that by the time the initializers are loaded, Rails.cache is already instantiated, so changing the settings does not achieve anything anymore. This was causing Rails to default to a file storage cache instead of the Redis cache, which in turn broke `rake cache:clear`.
* Remove protected_atrributes gem and start moving to strong paramsDmitriy Zaporozhets2014-06-261-6/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove rails observers from applicationDmitriy Zaporozhets2014-06-171-3/+0
|
* Remove user observerDmitriy Zaporozhets2014-06-171-2/+1
|
* Remove SystemHook observerDmitriy Zaporozhets2014-06-171-2/+1
|
* Remove NotesObserverDmitriy Zaporozhets2014-06-171-2/+1
|
* Remove project observerDmitriy Zaporozhets2014-06-171-1/+0
|
* Remove UsersGroup observerDmitriy Zaporozhets2014-06-171-1/+0
|
* Remove ProjectActivityCacheObserverDmitriy Zaporozhets2014-06-171-2/+1
|
* Replace milestone observer with servicesDmitriy Zaporozhets2014-06-101-2/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update warnings about relative url support.Marin Jankovski2014-05-131-1/+4
|
* Remove MergeRequest observerDmitriy Zaporozhets2014-04-021-1/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove KeysObserverDmitriy Zaporozhets2014-04-021-1/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'reduce-observers' into 'master'Dmitriy Zaporozhets2014-04-021-1/+0
|\ | | | | | | | | | | Move issue create/update code to services Reduce observers role in GitLab code
| * Remove issue observerDmitriy Zaporozhets2014-04-021-1/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add print.css to asset precompile array.Marin Jankovski2014-04-021-0/+1
|/
* Use EventCreateService for notes, merge requestsDmitriy Zaporozhets2014-03-251-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move services for collecting items to FindersDmitriy Zaporozhets2014-02-251-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add emoji images to asset load path.Andrew Kumanyaev2014-02-061-1/+3
|
* Fixed the I18n deprecation warningJeroen van Baarsen2014-01-091-0/+1
|
* Add project_services dir to autoload pathDmitriy Zaporozhets2013-12-171-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add DELETE to api corsDmitriy Zaporozhets2013-12-111-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status