summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-update-jquery' into 'master' Dmitriy Zaporozhets2015-12-231-5/+6
|\ | | | | | | | | | | | | Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0 Closes #2859 See merge request !2183
| * Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0Robert Speicher2015-12-221-5/+6
| |
* | Bump sass-rails to ~> 5.0.0rs-update-sass-railsRobert Speicher2015-12-221-6/+7
|/
* Merge branch 'rs-bump-nokogiri' into 'master' Robert Speicher2015-12-221-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly require Nokogiri 1.6.7.1 due to security issue ``` Name: nokogiri Version: 1.6.7 Advisory: CVE-2015-5312 Criticality: High URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s Title: Nokogiri gem contains several vulnerabilities in libxml2 Solution: upgrade to >= 1.6.7.1 ``` See merge request !2154
| * Explicitly require Nokogiri 1.6.7.1 due to security issuers-bump-nokogiriRobert Speicher2015-12-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | Name: nokogiri Version: 1.6.7 Advisory: CVE-2015-5312 Criticality: High URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s Title: Nokogiri gem contains several vulnerabilities in libxml2 Solution: upgrade to >= 1.6.7.1
* | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-211-0/+5
|\ \ | |/ |/|
| * add CAS authentication supporttduehr2015-12-141-0/+5
| |
* | Bump Rack Attack to v4.3.1 for security fixStan Hu2015-12-181-2/+2
| | | | | | | | https://github.com/kickstarter/rack-attack/releases/tag/v4.3.1
* | Upgrade Poltergeist to 1.8.1. #4131issue_4131Rubén Dávila2015-12-171-5/+5
| |
* | Merge branch 'feature/remove-celluloid' into 'master' Dmitriy Zaporozhets2015-12-161-25/+4
|\ \ | | | | | | | | | | | | | | | | | | Update rerun to remove celluloid as dependency After sidekiq 4 migration, we no longer need celluloid. `rerun` recent version also removed it from its dependency, so by getting this MR merged, we can solve #3797 See merge request !2088
| * | Update rerun to remove celluloid as dependencyfeature/remove-celluloidGabriel Mazetto2015-12-131-25/+4
| |/
* | Updated Rubocop to latest versionGabriel Mazetto2015-12-141-6/+7
|/
* Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037Douwe Maan2015-12-111-0/+2
| | | | | This reverts commit e426c027b0a2a3aa0dea1d833008f2bfd814f483, reversing changes made to c3676aa156981092b7f03f1a3e74bb819cfa2fc3.
* Merge branch 'rs-update-gitlab_emoji' into 'master' Valery Sizov2015-12-111-1/+1
|\ | | | | | | | | | | | | | | Bump gitlab_emoji to ~> 0.2.0 A new version of this gem was released October 29th but was never bumped in GitLab. See merge request !1994
| * Bump gitlab_emoji to ~> 0.2.0rs-update-gitlab_emojiRobert Speicher2015-12-051-1/+1
| |
* | Merge branch 'bump-devise-3.5.3' into 'master' Dmitriy Zaporozhets2015-12-111-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump devise to 3.5.3 to fix reset token expiring after account creation Also fixes an incorrect redirect after login with relative URL root: Closes https://github.com/gitlabhq/gitlabhq/issues/8228 Closes #2750 See merge request !2056
| * | Bump devise to 3.5.3 to fix reset token expiring after account creationStan Hu2015-12-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes an incorrect redirect after login with relative URL root: Closes https://github.com/gitlabhq/gitlabhq/issues/8228 Closes #2750
* | | Upgraded Sidekiq to 4.xfeature/sidekiq-4Gabriel Mazetto2015-12-101-7/+9
|/ /
* | Remove RedCloth and no longer allow bundle-audit to failDouwe Maan2015-12-091-2/+0
| |
* | Merge branch 'bump-gollum-version' into 'master' Valery Sizov2015-12-081-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Bump gollum-lib to 4.1.0 and fix dependency mismatch with rouge Closes #3767 See merge request !2017
| * | Bump gollum-lib to 4.1.0 and fix dependency mismatch with rougeStan Hu2015-12-081-3/+3
| | | | | | | | | | | | Closes #3767
* | | Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-081-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976
| * | Rename blob helper, bump version of gitlab_git to 7.2.21.Marin Jankovski2015-12-071-1/+1
| |/
* | add explicit reference to rouge 1.10.1gemfile_fixValery Sizov2015-12-081-0/+1
| |
* | Merge branch 'feature/sidekiq-cron' into 'master' Dmitriy Zaporozhets2015-12-071-16/+30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate from Sidetiq to Sidekiq-cron Migrate from Sidetiq to Sidekiq-cron Updated Sidekiq to 3.5.x This will solve #2355 See merge request !1982
| * | Migrate from Sidetiq to Sidekiq-cronfeature/sidekiq-cronGabriel Mazetto2015-12-041-16/+30
| |/ | | | | | | Updated Sidekiq to 3.5.x
* | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-0/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two issues: 1. The constraints in the resources were incorrect. Here's what it was before: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` In this case, id is actually the title of the milestone, which can be anything at the moment. After: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` 2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like: ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]): This change uses the babosa library to create a better slug, which surprisingly isn't actually used by the global milestone controllers. Instead, they use the title passed as a query string for some reason. Closes https://github.com/gitlabhq/gitlabhq/issues/9881 Fix constraints
* fix Celluloid warningsValery Sizov2015-12-031-18/+3
|
* Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-301-100/+145
|\ | | | | | | | | | | | | Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
| * fix specsrails_update_to_4_2Valery Sizov2015-11-301-2/+2
| |
| * Migrate mailers to ActiveJobValery Sizov2015-11-261-0/+1
| |
| * Merge remote-tracking branch 'origin/master' into rails_update_to_4_2Valery Sizov2015-11-261-14/+11
| |\
| * | update test_after_commit gem to 0.4.2Valery Sizov2015-11-261-2/+2
| | |
| * | Rails update to 4.2.4Valery Sizov2015-11-251-101/+145
| | |
* | | Bump jquery-turbolinks to ~> 2.1.0rs-update-jquery-turbolinksRobert Speicher2015-11-271-3/+3
| |/ |/| | | | | See #2857
* | Merge branch 'rs-remove-enumerize' into 'master' Dmitriy Zaporozhets2015-11-261-3/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove enumerize gem Closes #2803 See merge request !1912
| * | Remove enumerize gemrs-remove-enumerizeRobert Speicher2015-11-251-3/+0
| |/
* | Merge branch 'rs-update-asana' into 'master' Dmitriy Zaporozhets2015-11-261-9/+9
|\ \ | | | | | | | | | | | | | | | | | | Bump asana to ~> 0.4.0 Closes #2830 See merge request !1911
| * | Bump asana to ~> 0.4.0rs-update-asanaRobert Speicher2015-11-251-9/+9
| |/ | | | | | | Closes #2830
* | Bump doorkeeper to ~> 2.2.0rs-update-doorkeeperRobert Speicher2015-11-251-2/+2
|/ | | | Closes #2746
* Merge branch 'rs-update-colorize' into 'master' Dmitriy Zaporozhets2015-11-251-4/+2
|\ | | | | | | | | | | | | | | | | | | Bump colorize to ~> 0.7.0 Also removes `colored` which came in during the CI merge and is redundant. Closes #2822 See merge request !1895
| * Bump colorize to ~> 0.7.0Robert Speicher2015-11-241-4/+2
| | | | | | | | | | | | | | Also removes `colored` which came in during the CI merge and is redundant. Closes #2822
* | Merge branch 'rs-update-rack-oauth2' into 'master' Dmitriy Zaporozhets2015-11-251-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Bump rack-oauth2 to ~> 1.2.1 Closes #2748 See merge request !1891
| * | Bump rack-oauth2 to ~> 1.2.1rs-update-rack-oauth2Robert Speicher2015-11-241-3/+3
| |/
* | Merge branch 'rs-update-creole' into 'master' Dmitriy Zaporozhets2015-11-251-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Bump creole to ~> 0.5.0 Closes #2815 See merge request !1890
| * | Bump creole to ~> 0.5.0rs-update-creoleRobert Speicher2015-11-241-2/+2
| |/ | | | | | | Closes #2815
* | Bump gon to ~> 6.0.1rs-update-gonRobert Speicher2015-11-241-3/+5
|/ | | | Closes #2856
* Merge branch 'bundler-audit' into 'master' Dmitriy Zaporozhets2015-11-231-0/+4
|\ | | | | | | | | | | | | | | | | Add bundler-audit to CI Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @DouweM @rspeicher @vsizov See merge request !1874
| * Add bundler-audit to CIDmitriy Zaporozhets2015-11-231-0/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Updated rails patchFerdinand Rosario2015-11-191-27/+27
|/