summaryrefslogtreecommitdiff
path: root/config/application.rb
Commit message (Collapse)AuthorAgeFilesLines
* Replace namespace-specific application.js files with namespace-bundle.js files.rename-js-filesConnor Shea2016-07-151-4/+4
|
* Split Cropper.js from the main JavaScript manifest.Connor Shea2016-06-291-0/+1
|
* Add precompilation for relevant assets.Connor Shea2016-06-231-0/+2
|
* Replace raphael-rails with raphael.js so it can be split from the rest of ↵Connor Shea2016-06-101-0/+1
| | | | the JavaScript. The gem isn't maintained anymore anyway. Added a network folder with an application.js including raphael components, since that's the only page using it currently.
* Attempt to fix the user page.Connor Shea2016-06-011-1/+2
|
* Remove d3 except for on pages where it's necessary.Connor Shea2016-06-011-0/+1
|
* New confirmation email :fire:Robert Speicher2016-05-251-1/+1
|
* Merge branch 'fix-generator-templates-directory' into 'master' Jeroen van Baarsen2016-05-191-1/+3
|\ | | | | | | | | | | | | Move generator templates to generator_templates/ See merge request !4217
| * Move generator templates to generator_templates/Yorick Peterse2016-05-191-1/+3
| | | | | | | | | | | | Since we eager load everything in lib/ putting ERB code in .rb files will result in syntax errors. By moving the templates to ./generator_templates we can work around this.
* | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlightingSean McGivern2016-05-171-0/+1
|/ | | | | Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
* Fix a few places where autoloading would failRémy Coutable2016-05-101-6/+6
| | | | | | | | | | | - Fix naming of API::CommitStatuses - Ensure we use require_dependency instead of require - Ensure the namespace is right in lib/api/api.rb, otherwise, we might require Grape::API::Helpers which defines the `#params` method. This is to avoid requiring a file multiple times and getting an "Already initialized constant" error. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Add eager load paths to help prevent dependency load issues with Sidekiq workersStan Hu2016-05-101-6/+13
| | | | | | Attempts to address #13521, #14825 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Add more parameters to the filter_parameters config.Connor Shea2016-04-291-1/+24
| | | | | | | | Adds Sentry DSN, Webhooks, Deploy Keys, etc. Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences. This also seems to be the more popular syntax for adding new parameters, from what I can find.
* Put CACHE_NAMESPACE in the Gitlab::Redis moduleJacob Vosmaer2016-04-071-3/+1
|
* Add Gitlab::Redis connection poolJacob Vosmaer2016-04-041-2/+2
|
* Inline mailer CSS using premailer.Douwe Maan2016-03-191-0/+1
| | | | | # Conflicts: # Gemfile.lock
* Filter import_url params because they may contain auth information. Fixes #14199filter-import-urlJosh Frye2016-03-101-1/+1
|
* Parse config/resque.yml in one place onlyJacob Vosmaer2016-03-091-16/+2
|
* Don't generate factories automaticallyRobert Speicher2016-03-041-0/+4
|
* Use dedicated relative_url.rb initializerArtem Sidorenko2016-02-291-8/+0
| | | | in order to have it the same way like in omnibus
* 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
| * Update Emoji asset pathRobert Speicher2016-02-121-2/+2
| | | | | | | | | | Now that we're serving assets directly from the Gemojione gem's path, the images are not in an `emoji/` sub-folder.
* | Use SCAN during 'rake cache:clear'cache-clearJacob Vosmaer2016-02-181-1/+3
|/ | | | | | 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.
* 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>
View Lorry Controller Status