summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* remove six, and use a Set insteadhttp://jneen.net/2016-08-301-3/+0
|
* Update vmstat for {Open,Net}BSD supportSean McGivern2016-08-251-1/+1
|
* Merge branch 'rs-update-doorkeeper' into 'master' Robert Speicher2016-08-181-1/+1
|\ | | | | | | | | | | | | Update doorkeeper to 4.2.0 Changelog: https://git.io/v6PnV See merge request !5881
| * Update doorkeeper to 4.2.0Robert Speicher2016-08-181-1/+1
| | | | | | | | Changelog: https://git.io/v6PnV
* | Merge branch 'rs-issue-21017' into 'master' Robert Speicher2016-08-181-1/+1
|\ \ | |/ |/| | | | | | | | | Update Hamlit to 2.6.1 Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017 See merge request !5873
| * Update Hamlit to 2.6.1rs-issue-21017Robert Speicher2016-08-181-1/+1
| | | | | | | | Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017
* | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-181-1/+2
|\ \ | | | | | | | | | | | | | | | Support slash commands in issues / MR description & comments See merge request !5021
| * | Make slash commands contextualRémy Coutable2016-08-131-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | - Return only slash commands that make sense for the current noteable - Allow slash commands decription to be dynamic Other improvements: - Add permission checks in slash commands definition - Use IssuesFinder and MergeRequestsFinder - Use next if instead of a unless block, and use splat operator instead of flatten Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch ↵Jacob Schatz2016-08-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | Fix Ace syntax highlighting with compiled assets3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webuiSean McGivern2016-08-171-1/+1
| |/
* | Update gitlab_git gem to 10.4.7Ahmad Sherif2016-08-181-1/+1
| |
* | Add json-schema gem to test groupDouglas Barbosa Alexandre2016-08-171-0/+1
|/
* Upgrade Rails to 4.2.7.1 for security fixes.Connor Shea2016-08-111-1/+1
| | | | 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/
* Merge branch '13333-consider-updating-http-parser-rb-to-0-6-0' into 'master' Rémy Coutable2016-08-111-3/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Replace the tinder gem by bare HTTP requestsThomas Balthazar2016-08-111-3/+0
| |
* | Update Grape from 0.13.0 to 0.15.0.Connor Shea2016-08-091-1/+1
|/ | | | | | Changelog: https://github.com/ruby-grape/grape/blob/v0.15.0/CHANGELOG.md Works toward #18226.
* Update version_sorter and use new interface for faster tag sortingAlejandro Rodríguez2016-08-081-1/+1
|
* Bump gitlab_git to lazy load compare commits14202-compare-lazy-load-commitsPaco Guzman2016-08-051-1/+1
|
* Merge branch 'upgrade-newrelic-rpm' into 'master' Robert Speicher2016-08-041-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318.upgrade-newrelic-rpmConnor Shea2016-07-281-1/+1
| | | | | | | | | | | | Bug fixes and compatibility with Rails 5. Changelog: https://github.com/newrelic/rpm/blob/master/CHANGELOG
* | Speed up Commit#repo_changesAhmad Sherif2016-08-031-1/+1
| |
* | Bump gitlab_git to speedup DiffCollection iterationsPaco Guzman2016-07-291-1/+1
| |
* | Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez2016-07-281-1/+1
|/
* Merge branch 'cs-upgrade-bullet' into 'master' Robert Speicher2016-07-271-1/+1
|\ | | | | | | | | | | | | | | | | 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
| * Upgrade Bullet from 5.0.0 to 5.2.0.cs-upgrade-bulletConnor Shea2016-07-261-1/+1
| | | | | | | | | | | | Removes methods that were deprecated in Rails 5. Changelog: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md#520
* | Merge branch 'cs-upgrade-gon' into 'master' Robert Speicher2016-07-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Upgrade gon from 6.0.1 to 6.1.0.cs-upgrade-gonConnor Shea2016-07-221-1/+1
| |/ | | | | | | | | | | Removes methods that were deprecated in Rails 5. Changelog: https://github.com/gazay/gon/compare/3a2b56d...9d89bc9
* | Merge branch 'simple-cov' into 'master' Robert Speicher2016-07-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Generate coverage report from whole test suite Extends our CI plan to merge all coverage results and generate HTML report. See merge request !5018
| * | Depened on exact version of SimpleCov when patchedsimple-covGrzegorz Bizon2016-07-271-1/+1
| | |
| * | Use simplecov 0.12.0 which fixes merging test resultsKamil Trzcinski2016-07-211-1/+1
| | |
* | | Profile requests when a header is passedfeature/profile-requests-conditionallyAhmad Sherif2016-07-261-0/+2
| | |
* | | Upgrade database_cleaner from 1.4.1 to 1.5.3.cs-upgrade-database-cleanerConnor Shea2016-07-261-1/+1
| | | | | | | | | | | | | | | | | | This includes support for Rails 5 without deprecations warnings. Changelog: https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc#153-2016-04-22
* | | Add es6 gemJacob Schatz2016-07-251-0/+1
| | |
* | | Revert "Merge branch ↵Alejandro Rodríguez2016-07-241-1/+1
| |/ |/| | | | | | | '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…" This reverts merge request !5375
* | Update to gitlab_git 10.4.1 and take advantage of preserved Ref objectsAlejandro Rodríguez2016-07-211-1/+1
| |
* | Bump vmstat version to fix issues reporting on FreeBSDStan Hu2016-07-211-1/+1
|/
* Revert "Merge branch 'csp-basics' into 'master' "Robert Speicher2016-07-201-3/+0
| | | | | This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing changes made to f0b446e55506b251e85afd4bb063586bccb52eb2.
* Merge branch 'cs-gemojione-3' into 'master' Robert Speicher2016-07-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | 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
| * 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!
* | Merge branch 'csp-basics' into 'master' Robert Speicher2016-07-181-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Content Security Policy Ref: #18231 This uses twitter's [secure_headers gem](https://github.com/twitter/secureheaders). See merge request !4770
| * | Initial secure_headers config after some testing.Connor Shea2016-07-181-0/+3
| |/
* | Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-1/+1
|/
* Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-151-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 rouge, gollum-lib, and github-markuphttp://jneen.net/2016-07-141-3/+3
| |
* | Merge branch 'update-rubocop' into 'master' Robert Speicher2016-07-151-1/+1
|\ \ | |/ |/| | | | | | | | | 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
| * Resolve feedback.Connor Shea2016-07-131-1/+1
| |
| * Update rubocop to 0.41.2Z.J. van de Weg2016-07-131-1/+1
| | | | | | | | https://github.com/bbatsov/rubocop/blob/v0.41.2/CHANGELOG.md
* | Upgrade Rails from 4.2.6 to 4.2.7.Connor Shea2016-07-131-1/+1
|/ | | | | | Primarily just bug fixes. Changelog: https://github.com/rails/rails/compare/v4.2.6...v4.2.7
* Update the health_check gem to the latest releaseupdate-health-check-gemDJ Mountney2016-07-111-1/+1
| | | | This allows us to drop our disable email config override
* Merge branch 'bump-omniauth-google-oauth2' into 'master' Robert Speicher2016-07-101-1/+1
|\ | | | | | | | | | | | | Bump google-omniauth-oauth2 to 0.4.1 Closes #19064 See merge request !4882
View Lorry Controller Status