summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-bump-prometheus-gem-properly' into 'master'Robert Speicher2017-12-131-1/+1
* Bump redis-rails to 5.0.2 to get redis-store security updatesStan Hu2017-12-061-1/+1
* Migrate Gitlab::Git::Repository#revert to Gitalyfeature/migrate-revert-to-gitalyAhmad Sherif2017-12-051-1/+1
* Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master'Robert Speicher2017-12-041-1/+1
|\
| * Migrate Gitlab::Git::Repository#cherry_pick to GitalyAhmad Sherif2017-12-041-1/+1
* | Update Rails to 4.2.10Rémy Coutable2017-12-011-1/+1
|/
* Pin seed-fu to 2.3.6 since 2.3.7 is brokenRémy Coutable2017-11-301-1/+1
* Merge branch '40568-bump-seed-fu-to-2-3-7' into 'master'Rémy Coutable2017-11-281-1/+1
|\
| * Upgrade seed-fu to 2.3.7Takuya Noguchi2017-11-261-1/+1
* | Update prometheus gem to fix build on RPiPawel Chojnacki2017-11-271-1/+1
* | Merge branch '40481-bump-jquery-to-2-2-4' into 'master'Phil Hughes2017-11-271-1/+1
|\ \ | |/ |/|
| * Upgrade jQuery to 2.2.4Takuya Noguchi2017-11-231-1/+1
* | Update prometheus Gem to fix compilation on centos 6 duo to GCC not recognizi...Pawel Chojnacki2017-11-241-1/+1
* | Move prometheus middle ware to prometheus initialized.Pawel Chojnacki2017-11-231-1/+1
* | Update prometheus-client-gem to 0.7.0.beta33Pawel Chojnacki2017-11-231-1/+1
|/
* Batchload blobs for diff generationZeger-Jan van de Weg2017-11-211-0/+2
* Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refsAlejandro Rodríguez2017-11-171-1/+1
* Update license_finder to 3.1.1Winnie Hellmann2017-11-161-1/+1
* Incorporate Gitaly's WikiService.WikiGetAllPages RPCgitaly-wiki-get-all-pagesAlejandro Rodríguez2017-11-131-1/+1
* Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-311-3/+3
|\
| * Merge branch '39580-bump-carrierwave-to-1-2-1' into 'master'Rémy Coutable2017-10-311-1/+1
| |\
| | * Bump carrierwave to 1.2.1Takuya Noguchi2017-10-301-1/+1
| * | Migrate Gitlab::Git::Wiki#delete_page to GitalyAhmad Sherif2017-10-311-1/+1
| * | Update Prometheus Gem to fix problem caused by reading bad data.Pawel Chojnacki2017-10-301-1/+1
| |/
* | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-291-1/+1
|\ \ | |/
| * Support `Gitaly::User`'s gl_username fieldgitaly-gl-usernameAlejandro Rodríguez2017-10-231-1/+1
* | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-231-3/+3
|\ \ | |/
| * The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This...Paul B2017-10-231-1/+1
| * Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ...Stan Hu2017-10-191-1/+1
| |\
| | * Update Prometheus gem to fix problems with other files overwriting current filePawel Chojnacki2017-10-191-1/+1
| * | Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitalyAhmad Sherif2017-10-161-1/+1
| * | Merge Merge Requests via GitalyJacob Vosmaer2017-10-131-1/+1
| |/
* | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-121-1/+1
|\ \ | |/
| * Use gitaly-proto 0.41.0Jacob Vosmaer2017-10-101-1/+1
* | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-10-061-1/+1
|\ \ | |/
| * Merge branch 'fix/update-doorkeeper-openid-connect' into 'master'Rémy Coutable2017-10-061-1/+1
| |\
| | * Upgrade doorkeeper-openid_connectMarkus Koller2017-09-201-1/+1
* | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-031-3/+3
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'upstream/master' into gem/sm/bump-google-api-cl...Lin Jen-Shin2017-10-031-1/+1
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into gem/sm/bump-google-api-cl...Lin Jen-Shin2017-09-281-1/+1
| |\ \ \
| * | | | Bump google-api-client Gem from 0.8.6 to 0.13.6Shinya Maeda2017-09-261-3/+3
* | | | | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-10-031-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bump gitaly-proto version to v0.39.0feature/bump-gitaly-proto-versionAhmad Sherif2017-10-021-1/+1
* | | | | Merge remote-tracking branch 'origin/master' into sh-headless-chrome-supportJose Ivan Vargas2017-09-291-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Create repositories via GitalyJacob Vosmaer2017-09-291-1/+1
| * | | | Migrate Git::Repository#rm_tag to GitalyAhmad Sherif2017-09-281-1/+1
| | |/ / | |/| |
* | | | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-09-261-2/+2
|\ \ \ \ | |/ / /
| * | | Update omniauth-azure-oauth2 to 0.0.9 (Support Office 365 Germany)ueberbit/gitlab-ce-omniauth-azure-oauth2Florian Weber2017-09-261-1/+1
| |/ /
| * | Upgrade Nokogiri because of CVE-2017-9050winh-upgrade-nokogiriWinnie Hellmann2017-09-211-1/+1
* | | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-09-211-1/+2
|\ \ \ | |/ /