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-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-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-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-21Revert "Merge branch 'csp-basics' into 'master' "Robert Speicher
This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing changes made to f0b446e55506b251e85afd4bb063586bccb52eb2.
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-14update rouge, gollum-lib, and github-markuphttp://jneen.net/
2016-07-13Upgrade Rails from 4.2.6 to 4.2.7.Connor Shea
Primarily just bug fixes. Changelog: https://github.com/rails/rails/compare/v4.2.6...v4.2.7
2016-07-13Resolve feedback.Connor Shea
2016-07-13Update rubocop to 0.41.2Z.J. van de Weg
https://github.com/bbatsov/rubocop/blob/v0.41.2/CHANGELOG.md
2016-07-11Update the health_check gem to the latest releaseDJ Mountney
This allows us to drop our disable email config override
2016-07-10Merge branch 'bump-omniauth-google-oauth2' into 'master' Robert Speicher
Bump google-omniauth-oauth2 to 0.4.1 Closes #19064 See merge request !4882
2016-07-08Merge branch 'fix_gemfile' into 'master' Rémy Coutable
Fix gemfile 1. replace `"` to `'` in Gemfile. 2. change `require: nil` to `require: false`. `require: nil` and `require: false` get same result, but i think we shouldn't write it differently in other places. 3. set version for gems. better gem's version control for prevent dependency errors. See merge request !5078
2016-07-08Merge branch 'upgrade-oauth2' into 'master' Robert Speicher
Upgrade oauth2 from 1.0.0 to 1.2.0. Changelog: https://github.com/intridea/oauth2/compare/v1.0.0...v1.2.0 Follow-up on !3434 since 1.2.0 doesn't limit the JWT version we can use. Adds support for Rails 5. Working toward #14286. See merge request !5041
2016-07-05Merge branch 'update-gemoji' into 'master' Robert Speicher
Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione - No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Unless there's a particularly good reason we were using the gem? - Fixes the Rake task since it broke after all the AwardEmoji changes. - Update gemojione to 2.6.1. Spring Update changes! http://emojione.com/releases/#2.2.0 See merge request !4919
2016-07-05Merge branch 'upgrade-doorkeeper' into 'master' Robert Speicher
Upgrade Doorkeeper from 3.1.0 to 4.0.0. Includes Rails 5 support and various bug fixes. Working toward #14286. Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400 See merge request !5055
2016-07-04set version for gems.bogdanvlviv
better gem's version control for prevent dependency errors.
2016-07-04change `require: nil` to `require: false`bogdanvlviv
require: nil and require: false get same result, but i think we shouldn't write it differently in other places.
2016-07-04replace " to ' in Gemfilebogdanvlviv
2016-07-04Merge branch 'upgrade-rspec-rails' into 'master' Robert Speicher
Upgrade rspec-rails from 3.4.2 to 3.5.0. Also upgrade its dependencies. Includes Rails 5 support. Working toward #14286 Changelogs: http://rspec.info/blog/2016/07/rspec-3-5-has-been-released/ See merge request !5051
2016-07-03Update RedCloth to 4.3.2 for CVE-2012-6684Takuya Noguchi
2016-07-02Upgrade Doorkeeper from 3.1.0 to 4.0.0.Connor Shea
Includes Rails 5 support and various bug fixes. Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400
2016-07-01Merge branch 'upgrade-thin' into 'master' Robert Speicher
Upgrade Thin from 1.6.1 to 1.7.0. Includes support for Rack 2. Working toward #14286. Changelog: https://github.com/macournoyer/thin/blob/master/CHANGELOG See merge request !5047
2016-07-01Upgrade rspec-rails from 3.4.2 to 3.5.0.Connor Shea
Also upgrade its dependencies. Includes Rails 5 support. Changelogs: rspec-rails: https://github.com/rspec/rspec-rails/compare/v3.4.2...v3.5.0 rspec-core: https://github.com/rspec/rspec-core/compare/v3.4.0...v3.5.0 rspec-support: https://github.com/rspec/rspec-support/compare/v3.4.0...v3.5.0 rspec-expectations: https://github.com/rspec/rspec-expectations/compare/v3.4.0...v3.5.0 rspec-mocks: https://github.com/rspec/rspec-mocks/compare/v3.4.0...v3.5.0 rspec: https://github.com/rspec/rspec/compare/v3.4.0...v3.5.0
2016-07-01Upgrade Thin from 1.6.1 to 1.7.0.Connor Shea
Includes support for Rack 2. Changelog: https://github.com/macournoyer/thin/blob/master/CHANGELOG
2016-07-01Upgrade oauth2 from 1.0.0 to 1.2.0.Connor Shea
Changelog: https://github.com/intridea/oauth2/compare/v1.0.0...v1.2.0 Follow-up on !3434 since 1.2.0 doesn't limit the JWT version we can use.
2016-07-01Remove quiet_assets in favor of built-in sprockets-rails config.Connor Shea
quiet_assets has been seemingly abandoned, and now sprockets-rails has the feature built-in! From this PR: https://github.com/rails/sprockets-rails/pull/355
2016-06-30Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets
Loop all disks when displaying system info. Closes #18886 See merge request !4983
2016-06-30Remove coveralls as its unusedZ.J. van de Weg
2016-06-29Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.Connor Shea
No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Also fix the Rake task and update gemojione to 2.6.1. This adds the EmojiOne Spring update. Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md
2016-06-29Loop all disks when displaying system infoJosh Frye
2016-06-29Add fog-rackspace microgem to support backups using rackspace provider.jbub
2016-06-29Use number_to_human_size for system info and remove dependency on Filesize gem.Josh Frye
2016-06-29Show basic system info on admin panel. Closes #18886Josh Frye
2016-06-27Update omniauth-saml to 1.6.0 to address a security vulnerability in ruby-samlPatricio Cano
2016-06-24Upgrade sentry-raven from 0.15.6 to 1.1.0.Connor Shea
Changelog: https://github.com/getsentry/raven-ruby/releases
2016-06-24Restrict hamlit version, remove coffeescript filters.Connor Shea
2016-06-23bump google-omniauth-oauth2 to 0.4.1Pirate Praveen
2016-06-23Replace Haml with Hamlit.connorshea
Hamlit is a library that's faster than Haml while implementing most of its features: https://github.com/k0kubun/hamlit Not sure if this breaks anything, but as far as I can tell most things work the same. No obvious regressions that I've been able to find.
2016-06-22Merge branch 'update-mail_room-to-0.8.0' into 'master' Douwe Maan
Update mail_room to 0.8.0 to resolve #13357 Update mail_room to 0.8.0 to resolve #13357 Which includes the fix from: https://github.com/tpitale/mail_room/pull/73 See merge request !4835
2016-06-21Update mail_room to 0.8.0 to resolve #13357Lin Jen-Shin
Which includes the fix from: https://github.com/tpitale/mail_room/pull/73
2016-06-21Update browser gem to 2.2.0Stan Hu
Fixes https://github.com/fnando/browser/issues/241