Age | Commit message (Collapse) | Author |
|
|
|
|
|
This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing
changes made to f0b446e55506b251e85afd4bb063586bccb52eb2.
|
|
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
|
|
Content Security Policy
Ref: #18231
This uses twitter's [secure_headers gem](https://github.com/twitter/secureheaders).
See merge request !4770
|
|
|
|
|
|
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!
|
|
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
|
|
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
|
|
|
|
Primarily just bug fixes.
Changelog: https://github.com/rails/rails/compare/v4.2.6...v4.2.7
|
|
|
|
https://github.com/bbatsov/rubocop/blob/v0.41.2/CHANGELOG.md
|
|
This allows us to drop our disable email config override
|
|
Bump google-omniauth-oauth2 to 0.4.1
Closes #19064
See merge request !4882
|
|
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
|
|
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
|
|
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
|
|
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
|
|
better gem's version control for prevent dependency errors.
|
|
require: nil and require: false get same result, but i think we shouldn't write it differently in other places.
|
|
|
|
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
|
|
|
|
Includes Rails 5 support and various bug fixes.
Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400
|
|
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
|
|
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
|
|
Includes support for Rack 2.
Changelog: https://github.com/macournoyer/thin/blob/master/CHANGELOG
|
|
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.
|
|
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
|
|
Loop all disks when displaying system info. Closes #18886
See merge request !4983
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
Changelog: https://github.com/getsentry/raven-ruby/releases
|
|
|
|
|
|
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.
|
|
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
|
|
Which includes the fix from:
https://github.com/tpitale/mail_room/pull/73
|
|
Fixes https://github.com/fnando/browser/issues/241
|
|
Export project functionality
This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects.
- [x] members
- DB data
- [x] issues
- [x] issue comments
- [x] merge requests
- [x] merge request diff
- [x] merge request comments
- [x] labels
- [x] milestones
- [x] snippets
- [x] releases
- [x] events
- [x] commit statuses
- [x] CI builds
- File system data
- [x] Git repository
- [x] wiki
- [x] uploads
- [ ] ~~CI build traces~~
- [ ] ~~CI build artifacts~~
- [ ] ~~LFS objects~~
- DB configuration
- [x] services
- [x] web hooks
- [x] protected branches
- [x] deploy keys
- [x] CI variables
- [x] CI triggers
See merge request !3114
|
|
|
|
|
|
Replace raphael-rails with raphael.js and split it from the rest of the JS
## What does this MR do?
Removes raphael.js and its related libraries from the default JS bundle.
It also removes raphael-rails because the gem is unmaintained and – for whatever reason – didn't want to cooperate with the way I was trying to require it.
This brings the default (compressed and minified) application.js from 354KB after the d3 MR (!4394) down to 324KB.
## Are there points in the code the reviewer needs to double check?
That tests pass and that there aren't errors on any pages (especially the Network page).
## Why was this MR needed?
It's only used on the Network page and was using way too much bandwidth for just one page.
## What are the relevant issue numbers?
#14372 #13165
Follow-up to !4394 and !4516.
cc: @jschatz1
See merge request !4519
|