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
path: root/Gemfile
AgeCommit message (Collapse)Author
2016-09-27Merge branch 'zj-remove-deprecation-warnings-sprockets' into 'master' Rémy Coutable
Remove Sprockets deprecation warning See merge request !6535
2016-09-27Merge branch 'cs-upgrade-unicorn' into 'master' Robert Speicher
Upgrade unicorn and unicorn-worker-killer. Upgrade unicorn from 4.9.0 to 5.1.0 and unicorn-worker-killer from 0.4.2 to 0.4.4. This includes Rack 2.0 support which is necessary for Rails 5. Changelog for unicorn: http://unicorn.bogomips.org/NEWS.html Changelog for unicorn-worker-killer: https://github.com/kzk/unicorn-worker-killer/blob/bdec225f028d1bda01b5888578c479b0c705f1a8/ChangeLog See merge request !6463
2016-09-27Remove Sprockets deprecation warningZ.J. van de Weg
2016-09-26update sprockets versionubudzisz
update sprockets version
2016-09-25Remove gitlab_meta gemRobert Speicher
2016-09-22Upgrade unicorn and unicorn-worker-killer.Connor Shea
Upgrade unicorn from 4.9.0 to 5.1.0 and unicorn-worker-killer from 0.4.2 to 0.4.4. Changelog for unicorn: http://unicorn.bogomips.org/NEWS.html Changelog for unicorn-worker-killer: https://github.com/kzk/unicorn-worker-killer/blob/bdec225f028d1bda01b5888578c479b0c705f1a8/ChangeLog
2016-09-21Revert "Merge branch 'rs-update-rubocop-rspec' into 'master'"Robert Speicher
This reverts commit 70faf5fdfbfa0e427b12d4181a9302394974c3cf, reversing changes made to 2307eb84dcd1748cc231719017551111310d1bf9.
2016-09-21Merge branch 'cs-upgrade-sidekiq' into 'master' Robert Speicher
Upgrade Sidekiq to 4.2.1, remove dependency on Sinatra This updates Sidekiq to 4.2.1, which adds full support for Rails 5 by removing a dependency on Sinatra which was one of the remaining Rails 5 blockers. Major things to check: Sidekiq still works, obviously. Also that the Web UI/Admin dashboard works and doesn't lose any functionality (based on my testing it works fine). Working toward #14286. Changelog: https://github.com/mperham/sidekiq/blob/921e939f995fbb5238975d4121d728b95be99ab5/Changes.md#421 See merge request !6349
2016-09-20Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew
2016-09-16Use oj gem for faster JSON processingAhmad Sherif
It's mainly intended to improve Elasticsearch indexing performance (through multi_json gem), but other gems could benefit from it too, like grape.
2016-09-16Upgrade Sidekiq from 4.1.4 to 4.2.1, remove dependency on SinatraConnor Shea
Changelog: https://github.com/mperham/sidekiq/blob/921e939f995fbb5238975d4121d728b95be99ab5/Changes.md#421 Sinatra is no longer required and sidekiq uses a vanilla Rack app for its Web UI now.
2016-09-15Bump rubocop-rspec to 1.7.0Robert Speicher
2016-09-15Merge branch 'rs-update-rubocop' into 'master' Rémy Coutable
Bump rubocop to 0.42.0 Also updates `.rubocop_todo.yml` for the latest cops. See merge request !6354
2016-09-14Bump rubocop to 0.42.0Robert Speicher
2016-09-14Merge branch 'update-gitlab-git' into 'master' Douwe Maan
Update gitlab_git to 10.6.6 ## What does this MR do? This updates gitlab_git to version 10.6.6 ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? 10.6.4/10.6.5/10.6.6 contains some changes regarding marking blobs as binary, this can improve page loading times. ## Does this MR meet the acceptance criteria? - [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - Tests - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22144 See merge request !6279
2016-09-14Merge branch '21748-updating-omniauth-facebook' into 'master' Douwe Maan
Update omniauth-facebook to '~>4.0.0' ## What does this MR do? Update omniauth-facebook to '~>4.0.0' ## What are the relevant issue numbers? Closes #21748 cc @ubudzisz @yorickpeterse @grzesiek @tmaczukin See merge request !6321
2016-09-14Update gitlab_git to 10.6.6Yorick Peterse
2016-09-13Update omniauth-facebook to '~>4.0.0'Katarzyna Kobierska
2016-09-13Use haml_lint for views lintingRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-07Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew
2016-09-06Updated gitlab_git to 10.6.3Yorick Peterse
This allows us to take advantage of https://gitlab.com/gitlab-org/gitlab_git/merge_requests/121.
2016-09-01Optimize branch lookups and force a repository reload for Repository#find_branchStan Hu
If `git gc` runs and `Repository` has an instance to `Rugged::Repository`, a bug in libgit2 may cause the instance to return a stale value or a missing branch. This change not only optimizes the branch lookup so we don't have to iterate through every branch, but it also works around the `git gc` issue by forcing a repository reload every time `Repository#find_branch` is called. See: https://github.com/libgit2/libgit2/issues/1534 Closes #15392, #21470
2016-08-30remove six, and use a Set insteadhttp://jneen.net/
2016-08-26Add a spec for the `CycleAnalytics#issue` method.Timothy Andrew
2016-08-25Update vmstat for {Open,Net}BSD supportSean McGivern
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-19Update doorkeeper to 4.2.0Robert Speicher
Changelog: https://git.io/v6PnV
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 '4273-slash-commands' into 'master'Robert Speicher
Support slash commands in issues / MR description & comments See merge request !5021
2016-08-18Merge 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-18Update Hamlit to 2.6.1Robert Speicher
Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017
2016-08-18Update gitlab_git gem to 10.4.7Ahmad Sherif
2016-08-17Add json-schema gem to test groupDouglas Barbosa Alexandre
2016-08-17Fix Ace syntax highlighting with compiled assetsSean McGivern
2016-08-13Make slash commands contextualRémy Coutable
- 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>
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-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 '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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-10 01:49:21 +0300