summaryrefslogtreecommitdiff
path: root/config/application.rb
Commit message (Collapse)AuthorAgeFilesLines
* merge cropper library into profile_bundlecommons-chunk-pluginMike Greiling2017-03-031-1/+0
|
* CORS: Whitelist pagination headersexpose-pagination-headersRobert Schilling2017-03-021-2/+2
|
* add rack middleware to proxy webpack dev serverMike Greiling2017-02-011-0/+2
|
* precompile webpack assets when testingMike Greiling2017-01-101-0/+1
|
* migrate all javascript asset bundles and require syntaxMike Greiling2017-01-101-17/+3
|
* add webpack, webpack-rails, and webpack-dev-server along with a simple hello ↵Mike Greiling2017-01-061-0/+5
| | | | | | | | world test Add the following line to GDK Procfile to play with it: webpack: exec support/exec-cd gitlab npm run dev-server
* Add KaTeX fonts to assets paths and precompileHiroyuki Sato2016-12-221-0/+2
|
* Remove unneeded bundle refs.backport-mr-widget-ci-jsBryce Johnson2016-12-211-2/+0
|
* Backport moving MR widget CI JS out of script tag.Bryce Johnson2016-12-211-0/+3
|
* Add xterm.js 2.1.0 and a wrapper class to the asset pipelineNick Thomas2016-12-191-0/+2
|
* Merge branch 'rs-filter-params' into 'security' bpj-issuable-sidebar-autoupdatebackport-link_to_member_avatarRémy Coutable2016-12-151-1/+3
| | | | | | | Filter `incoming_email_token` and `runners_token` parameters Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2676 See merge request !2045
* Merge branch 'katex-math' into 'master' Sean McGivern2016-12-151-0/+2
|\ | | | | | | | | | | | | Render math in Asciidoc and Markdown with KaTeX using code blocks Closes #13690 and #13180 See merge request !8003
| * Render math in Asciidoc and Markdown with KaTeX using code blocksMunken2016-12-141-0/+2
| |
* | Merge branch 'rs-filter-authentication_token' into 'security' Douwe Maan2016-12-081-1/+2
|/ | | | | Add authentication_token to filter_parameters list See merge request !2041
* Includes page specific JSFilipa Lacerda2016-11-161-0/+1
|
* Create cycle analytics bundlePhil Hughes2016-10-281-0/+1
| | | | This prevents VueJS being included in application.js & therefore included on everypage
* Re-organize queues to use for Sidekiqseparate-sidekiq-queuesYorick Peterse2016-10-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Dumping too many jobs in the same queue (e.g. the "default" queue) is a dangerous setup. Jobs that take a long time to process can effectively block any other work from being performed given there are enough of these jobs. Furthermore it becomes harder to monitor the jobs as a single queue could contain jobs for different workers. In such a setup the only reliable way of getting counts per job is to iterate over all jobs in a queue, which is a rather time consuming process. By using separate queues for various workers we have better control over throughput, we can add weight to queues, and we can monitor queues better. Some workers still use the same queue whenever their work is related. For example, the various CI pipeline workers use the same "pipeline" queue. This commit includes a Rails migration that moves Sidekiq jobs from the old queues to the new ones. This migration also takes care of doing the inverse if ever needed. This does require downtime as otherwise new jobs could be scheduled in the old queues after this migration completes. This commit also includes an RSpec test that blacklists the use of the "default" queue and ensures cron workers use the "cronjob" queue. Fixes gitlab-org/gitlab-ce#23370
* Create protected branches bundleAlfredo Sumaran2016-10-201-0/+1
|
* Refactor JS codeAlfredo Sumaran2016-10-131-0/+1
| | | | | | - Use a store base object to manage application state. - Add a service to handle ajax requests. - Load code only when needed
* Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-061-0/+2
|\ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Don't send Private-Token headers to SentryJacob Vosmaer2016-10-041-0/+2
| | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22537
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-09-291-2/+13
|\ \
| * | Set a restrictive CORS policy on the API for credentialed requestsNick Thomas2016-09-261-0/+11
| | | | | | | | | | | | | | | | | | Cross-origin requests can still be made, as long as the client doesn't use the Rails session cookie to do so. Existing clients should not be setting 'withCredentials: true', so this should be fine.
| * | Move Rack::Attack and Rack::Cors middlewares to be before Warden::ManagerNick Thomas2016-09-261-2/+2
| |/
* | Use a ConnectionPool for Rails.cache on Sidekiq servers22364-rails-cache-connection-pool-sidekiq-serversPaco Guzman2016-09-281-0/+4
|/ | | | | | | It’s important to remember that connections on ConnectionPool are created when needed so if modify the objects later to create those connections weird things could happen https://gitlab.com/gitlab-com/infrastructure/issues/464#note_15850653
* Revert "Merge branch '22364-rails-cache-redis-connection-pool' into 'master'"Rubén Dávila Santos2016-09-221-4/+0
| | | This reverts merge request !6429
* Use a ConnectionPool for Rails.cache on Sidekiq servers22364-rails-cache-redis-connection-poolPaco Guzman2016-09-201-0/+4
|
* Merge branch 'ace-ventura' into 'master' Jacob Schatz2016-08-191-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ace ventura ## What does this MR do? Makes Ace only load when it's actually necessary. The only two places it seems to be used is for Snippets and the File (Blob) Editor. Before minification or compression, this takes the application.js down from 2.2MB to 1.6MB, and also removes two inline scripts :D Compressed/Minified: master: 317KB/1.1MB, ace-ventura: 220KB/771KB ## Are there points in the code the reviewer needs to double check? That this doesn't just completely break anything. ## Why was this MR needed? Ace is a big library, this allows us to only load it when necessary. ## What are the relevant issue numbers? #14372 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4914
| * Only load Ace on Snippets and file edit pages.Connor Shea2016-08-181-0/+2
| |
* | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-171-0/+2
|\ \ | |/
| * Added simulate drag JS for testsPhil Hughes2016-08-171-0/+1
| |
| * Hooked up JS to allow issues to be moved between columnsPhil Hughes2016-08-171-0/+1
| |
* | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-121-1/+2
|\ \ | |/
| * Deduplicated resque.yml loading from several placesGabriel Mazetto2016-08-041-1/+2
| | | | | | | | We will trust redis configuration params loading to Gitlab::RedisConfig.
* | Correctly resolves/unresolves discussionsPhil Hughes2016-07-261-1/+1
| |
* | convert CS to JSPhil Hughes2016-07-261-1/+1
| |
* | Diff line comments resolvePhil Hughes2016-07-241-0/+1
|/
* Merge branch 'rename-js-files' into 'master' Fatih Acet2016-07-201-4/+4
|\ | | | | | | | | | | | | | | | | | | | | Replace namespace-specific application.js files with namespace-bundle.js files. Following up on the per-page JavaScript improvements, I wanted to replace the use of `application.js` with `namespace-bundle.js` to prevent confusion when downloading more than one application.js file. This is pretty much just for the sake of clarity. cc: @alfredo1 See merge request !5221
| * Replace namespace-specific application.js files with namespace-bundle.js files.rename-js-filesConnor Shea2016-07-151-4/+4
| |
* | Upgrade Gemojione from 2.6.1 to 3.0.1.Connor Shea2016-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the 2016 emoji as well as support for using SVG images instead of PNGs. It also fixes a number of incorrectly categorized emoji and other minor issues. Upgrade Rake task for Gemojione 3.0.0 and generate sprites. Upgrade aliases.json by pulling down index.json from the gemojione repository and running the generate_aliases.rb file. Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md#v301-2016-07-16 For the specific emoji added to the Unicode standard, see: http://emojione.com/releases/2.2.4/ Huge kudos to Jonathan Wiesel (@jonathanwiesel) for his work on the gemojione gem!
* | Load Javascript U2F library selectively.Timothy Andrew2016-07-141-0/+1
|/ | | | | | | | | | 1. Only on supported Chrome versions 2. Mainly, this lets us simplify the javascript-based U2F check to `window.u2f`, where `window.u2f` can either be loaded from the GitLab server (for Chrome) or from the Firefox extension. 3. This is a better way to provide browser detection for U2F.
* 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
View Lorry Controller Status