Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-06Merge branch 'sh-reload-find-branch' into 'master' Yorick Peterse
Optimize branch lookups and force a repository reload for Repository#find_branch See merge request !6087
2016-08-26Merge branch '21378-error-500-after-8-11-update-on-system-infos-page' into ↵Robert Speicher
'master' Handle unavailable system info ## What does this MR do? Handle the case where we can't get system info without blowing up. As this is the first tab in the monitoring section, it's difficult to get to the other tabs if this page throws a 500. Also be more specific about the info we want, so we don't fail on something we don't care about (like `/proc/net/dev`). ## Why was this MR needed? grsecurity can prevent users from reading `/proc`, which is what Vmstat uses to find CPU and memory info. ## What are the relevant issue numbers? Closes #21378. See merge request !5989
2016-08-19Merge branch '4273-slash-commands' into 'master'Robert Speicher
Support slash commands in issues / MR description & comments See merge request !5021
2016-08-19Merge branch ↵Jacob Schatz
'3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webui' into 'master' Fix Ace syntax highlighting with compiled assets ## What does this MR do? Update ACE to 4.1.0 to allow modes (syntax highlighting files for particular languages) to be lazily loaded. ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? Syntax highlighting in the file editor only worked in development and test modes, not in production! ## What are the relevant issue numbers? Closes #3225. ## Screenshots (if relevant) First, the test setup - add these lines to `development.rb`: ```ruby config.assets.debug = false config.assets.compile = false config.assets.digest = true ``` Then, before starting the server, run `bundle exec rake assets:clobber assets:precompile`. Before: ![image](/uploads/486198e273019f8969d2e90560d82928/image.png) There is an error in the console because `/assets/ace/mode-ruby.js` was not found (it's only available when assets are compiled on demand). After: ![image](/uploads/6aa0d69b7efdfd6fe6aa22b9a49e9716/image.png) This loads `/assets/ace/mode-ruby-3915f95a6cc47306b1305e4dcb7aca25b2ef9c49b18ec6011707135b6575d8f3.js`, which works because the precompile step included it and told ACE where to find it. ## Does this MR meet the acceptance criteria? - [x] [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~~ - [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 !5501
2016-08-19Merge branch 'rs-issue-21017' into 'master' Robert Speicher
Update Hamlit to 2.6.1 Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017 See merge request !5873
2016-08-19Merge branch 'rs-update-doorkeeper' into 'master' Robert Speicher
Update doorkeeper to 4.2.0 Changelog: https://git.io/v6PnV See merge request !5881
2016-08-18Merge branch 'fix/update-gitlab-git' into 'master' Yorick Peterse
Update gitlab_git gem to 10.4.7 See merge request !5851
2016-08-17Merge branch 'issue-boards' into 'master'Douwe Maan
Issue boards - Issue: #17907 - Issue backend: #20335 - Backend MR: !5548 - Frontend MR: !5554 - Documentation !5713 - [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 - [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5548
2016-08-16Upgrade httpclient gem from 2.7.0.1 to 2.8.2.Connor Shea
Fixes deprecation warnings from Ruby 2.3. Changelog: https://github.com/nahi/httpclient/blob/b51d7a8bb78f71726b08fbda5abfb900d627569f/CHANGELOG.md#changes-in-282
2016-08-11Upgrade Rails to 4.2.7.1 for security fixes.Connor Shea
More information available at: http://weblog.rubyonrails.org/2016/8/11/Rails-5-0-0-1-4-2-7-2-and-3-2-22-3-have-been-released/
2016-08-11Merge branch '13333-consider-updating-http-parser-rb-to-0-6-0' into 'master' Rémy Coutable
Replace the tinder gem by bare HTTP requests ## What does this MR do? It removes the `tinder` gem (used to talk to the Campfire API) and replaces its use by bare HTTP requests. ## Are there points in the code the reviewer needs to double check? N/A. ## Why was this MR needed? To simplify the potential dependency hell discussed in #13333. The initial issue was about updating `http_parser.rb` which was required by `twitter-stream` which was required by `tinder`. Those 3 gems are not needed anymore. ## What are the relevant issue numbers? #13333 ## Screenshots (if relevant) N/A. ## 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) - Tests - [x] Added for this feature/bug - [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) Closes #13333 See merge request !5758
2016-08-11Replace the tinder gem by bare HTTP requestsThomas Balthazar
2016-08-09Update Grape from 0.13.0 to 0.15.0.Connor Shea
Changelog: https://github.com/ruby-grape/grape/blob/v0.15.0/CHANGELOG.md Works toward #18226.
2016-08-08Update version_sorter and use new interface for faster tag sortingAlejandro Rodríguez
2016-08-05Bump gitlab_git to lazy load compare commitsPaco Guzman
2016-08-05Merge branch 'upgrade-newrelic-rpm' into 'master' Robert Speicher
Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318. ## What does this MR do? While we intend to remove newrelic in the future, it'll probably not happen until 9.0 due to. In the meantime, I'd like to update the gem so it won't block Rails 5. Changelog: https://github.com/newrelic/rpm/blob/master/CHANGELOG ## Why was this MR needed? Rails 5 compatibility. Relevant issues: #14286, #12860 See merge request !5553
2016-08-03Speed up Commit#repo_changesAhmad Sherif
2016-07-29Bump gitlab_git to speedup DiffCollection iterationsPaco Guzman
2016-07-28Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez
2016-07-28Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318.Connor Shea
Bug fixes and compatibility with Rails 5. Changelog: https://github.com/newrelic/rpm/blob/master/CHANGELOG
2016-07-27Merge branch 'cs-upgrade-attr-encrypted' into 'master' Robert Speicher
Update attr_encrypted from 3.0.1 to 3.0.2 This removes methods that were deprecated by Rails 5 so we won't have as many deprecation warnings when we update to Rails 5. Working toward #14286. Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.md#302 See merge request !5438
2016-07-27Merge branch 'cs-upgrade-rack-oauth2' into 'master' Robert Speicher
Update rack-oauth2 from 1.2.1 to 1.2.3. Removes methods deprecated in Rails 5. Working toward #14286. Changelog: https://github.com/nov/rack-oauth2/compare/v1.2.1...v1.2.3 See merge request !5439
2016-07-27Merge branch 'cs-upgrade-bullet' into 'master' Robert Speicher
Upgrade Bullet from 5.0.0 to 5.2.0 Removes methods that were deprecated in Rails 5. Working toward #14286. Changelog: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md#520-07262016 See merge request !5443
2016-07-27Merge branch 'cs-upgrade-gon' into 'master' Robert Speicher
Upgrade gon from 6.0.1 to 6.1.0. Removes methods that were deprecated in Rails 5. Working toward #14286. Changelog: https://github.com/gazay/gon/compare/3a2b56d...9d89bc9 See merge request !5442
2016-07-27Merge branch 'cs-upgrade-default-value-for' into 'master' Robert Speicher
Upgrade default_value_for from 3.0.1 to 3.0.2. Includes support for Rails 5. Working toward #14286. Changelog: https://github.com/FooBarWidget/default_value_for/compare/release-3.0.1...release-3.0.2 See merge request !5441
2016-07-27Merge branch 'simple-cov' into 'master' Robert Speicher
Generate coverage report from whole test suite Extends our CI plan to merge all coverage results and generate HTML report. See merge request !5018
2016-07-27Depened on exact version of SimpleCov when patchedGrzegorz Bizon
2016-07-26Profile requests when a header is passedAhmad Sherif
2016-07-26Upgrade database_cleaner from 1.4.1 to 1.5.3.Connor Shea
This includes support for Rails 5 without deprecations warnings. Changelog: https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc#153-2016-04-22
2016-07-26Upgrade Bullet from 5.0.0 to 5.2.0.Connor Shea
Removes methods that were deprecated in Rails 5. Changelog: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md#520
2016-07-25Add es6 gemJacob Schatz
2016-07-24Revert "Merge branch ↵Alejandro Rodríguez
'17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…" This reverts merge request !5375
2016-07-24Update attr_encrypted from 3.0.1 to 3.0.3Connor Shea
This removes methods that were deprecated by Rails 5. Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.md#303
2016-07-22Upgrade gon from 6.0.1 to 6.1.0.Connor Shea
Removes methods that were deprecated in Rails 5. Changelog: https://github.com/gazay/gon/compare/3a2b56d...9d89bc9
2016-07-22Upgrade default_value_for from 3.0.1 to 3.0.2.Connor Shea
Includes support for Rails 5. Changelog: https://github.com/FooBarWidget/default_value_for/compare/release-3.0.1...release-3.0.2
2016-07-22Update rack-oauth2 from 1.2.1 to 1.2.3.Connor Shea
Removes methods deprecated in Rails 5. https://github.com/nov/rack-oauth2/compare/v1.2.1...v1.2.3
2016-07-22Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez
2016-07-21Bump vmstat version to fix issues reporting on FreeBSDStan Hu
2016-07-21Remove unused coverallsKamil Trzcinski
2016-07-21Revert "Merge branch 'csp-basics' into 'master' "Robert Speicher
This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing changes made to f0b446e55506b251e85afd4bb063586bccb52eb2.
2016-07-19use 2.0.5, actually (2.0.4 was a bad release)http://jneen.net/
2016-07-19upgrade rouge to 2.0.4http://jneen.net/
2016-07-19Merge branch 'cs-gemojione-3' into 'master' Robert Speicher
Upgrade gemojione to 3.0.0 Upgrades gemojione to 3.0.0, see the Changelog: https://github.com/jonathanwiesel/gemojione/blob/b98aa8b07eef815d4d3f52ff3c8714b28932b0de/CHANGELOG.md#v300-2016-07-12 [Here are all the new 2016 emoji](http://emojione.com/releases/2.2.4/) :tada: This update has new emoji and more sensical categories. See merge request !5237
2016-07-19Merge branch 'csp-basics' into 'master' Robert Speicher
Content Security Policy Ref: #18231 This uses twitter's [secure_headers gem](https://github.com/twitter/secureheaders). See merge request !4770
2016-07-18Collapsed diffs lines/size don't accumulate to overflow diffs.Paco Guzman
2016-07-18Initial secure_headers config after some testing.Connor Shea
2016-07-18Upgrade Gemojione from 2.6.1 to 3.0.1.Connor Shea
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!
2016-07-15Merge branch 'feature.rouge-20' into 'master' Robert Speicher
Upgrade to Rouge 2.0 ## What does this MR do? This MR is a refactor of the HTMLGitlab formatter. The original was copy-pasted from the legacy HTML formatter and adapted to suit our needs. In particular, this MR: * Strips dead code and unused options * Factors out the "wrapping" into the places that care about it - Bonzai and the view helpers * Uses the Rouge 2.0 `token_lines` method to split tokens into lines, removing the custom code we used to do the same * Uses the now-public `span` method instead of re-implementing it ourselves * Removes options to not split into lines - the places where this feature wasn't being used are now using the plain `Formatters::HTML` instead of this class See merge request !4691
2016-07-15Merge branch 'update-rubocop' into 'master' Robert Speicher
Update rubocop to 0.41.2 Adds a couple of cops to the TODO files, but I wanted [a specific cop](https://github.com/bbatsov/rubocop/pull/3135/files) which just had about 65 offences, so Ill do that later. See merge request !4999
2016-07-14bump rouge to 2.0.3http://jneen.net/