- 15 Aug, 2016 28 commits
-
-
Ruben Davila authored
-
Rubén Dávila Santos authored
Run Sidekiq in inline mode to ensure indexing occurs in spec See merge request !651
-
Stan Hu authored
-
Ruben Davila authored
-
Ruben Davila authored
-
Ruben Davila authored
-
Douwe Maan authored
Show deployment status on a MR view ## What are the relevant issue numbers? Resolves #19571, one in the list of #19992 ## Screenshots (if relevant) external_url = nil ![Screen_Shot_2016-08-02_at_13.57.03](/uploads/20ea1587eea556c7a1acd0ff726a5bfb/Screen_Shot_2016-08-02_at_13.57.03.png) external_url != nil ![Screen_Shot_2016-08-02_at_13.59.59](/uploads/0094b9ddece3f4bf76c83988840c096d/Screen_Shot_2016-08-02_at_13.59.59.png) Note, the timings are weird between merging and deploying, that is because I did it in the wrong order. ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing See merge request !5622
-
Douwe Maan authored
Limit the size of SVGs when viewing them as blobs ## What does this MR do? This MR prevents rendering of SVG blobs larger than 2 MB. ## Are there points in the code the reviewer needs to double check? I couldn't figure out how to properly test the view for this as this requires a large SVG (inflating the repository size) _or_ stubbing, the latter doesn't really seem possible using Spinach and all the stuff potentially involved. ## Why was this MR needed? When rendering large SVG blobs (e.g. 20 MB files) a request may time out and consume a lot of memory. ## What are the relevant issue numbers? #1435 ## Screenshots (if relevant) ![svg_notice](/uploads/c8de32522eda95a41a24555c3f85bfc1/svg_notice.jpg) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] ~~API support added~~ - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] 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) cc @jschatz1 @annabeldunstone (there are some UI changes, see the above screenshot). See merge request !5794
-
Valery Sizov authored
Update changelog See merge request !649
-
Valery Sizov authored
[ES] Improved code search Changelog item is already there See merge request !648
-
Valery Sizov authored
-
Valery Sizov authored
CE upstream @ayufan Please resolve conflicts: ``` Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) deleted by them: app/services/create_commit_builds_service.rb both modified: app/services/git_push_service.rb both modified: app/services/git_tag_push_service.rb both modified: spec/models/ci/pipeline_spec.rb both modified: spec/requests/ci/api/builds_spec.rb ``` @ayufan Assigned to you since you are the author https://gitlab.com/gitlab-org/gitlab-ce/commit/39203f1adfc6fee3eca50f0cab99ffc597865200 /cc @jacobvosmaer-gitlab See merge request !644
-
Jacob Schatz authored
Use new PhantomJS version ## What does this MR do? Makes CI builds to use PhantomJS 2.1.1. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5740
-
Valery Sizov authored
-
Yorick Peterse authored
Try to get back todo's cache or at least avoid hitting the database See merge request !5789
-
Yorick Peterse authored
Speed up todos queries by limiting the projects set we join with See merge request !5791
-
Yorick Peterse authored
This ensures that SVGs greater than 2 megabytes are not scrubbed and rendered. This in turn prevents requests from timing out due to reading/scrubbing large SVGs potentially taking a lot of time (and memory). The use of 2 megabytes is completely arbitrary. Fixes gitlab-org/gitlab-ce#1435
-
Ahmad Sherif authored
Follow-up 1003454c
-
Ahmad Sherif authored
Follow-up on 1003454c
-
Ahmad Sherif authored
-
Ahmad Sherif authored
Closes #20828
-
Phil Hughes authored
-
Yorick Peterse authored
Change the order of the access rules to check simpler first, and add specs See merge request !5799
-
Jeroen van Baarsen authored
Ability to restrict branches for pivotal tracker integration ## What does this MR do? It allows to specify branches which you want to track for pivotal tracker integration. ## Why was this MR needed? Typical use case: send commits to PivotalTracker and finish the story only when the feature branch is merged into master. See merge request !5752
-
Valery Sizov authored
-
Yorick Peterse authored
Fix a memory leak caused by Banzai::Filter::SanitizationFilter See merge request !5808
-
Valery Sizov authored
-
Egor Lynko authored
-
- 14 Aug, 2016 2 commits
-
-
Ahmad Sherif authored
In Banzai::Filter::SanitizationFilter#customize_whitelist, we append three lambdas that has reference to the SanitizationFilter instance, which in turn (potentially) has a reference to the following chain: context hash -> Project instance -> Repository instance -> lookup hash -> various Rugged instances -> various mmap-ed git pack files. All of the above is not garbage collected because the array we append the lambdas to is the constant HTML::Pipeline::SanitizationFilter::WHITELIST.
-
Ruben Davila authored
The format of the `config/resque.yml.example` file has changed and we need to adjust the reading of the connection URL.
-
- 13 Aug, 2016 10 commits
-
-
Ruben Davila authored
-
Ruben Davila authored
-
Ruben Davila authored
-
Kamil Trzcinski authored
-
Alfredo Sumaran authored
-
Connor Shea authored
-
Phil Hughes authored
-
Phil Hughes authored
-
Phil Hughes authored
-
Phil Hughes authored
-