summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | Upgrade gitlab-markup gemMarkus Koller2017-09-201-1/+1
| |/
| * Add test-profRémy Coutable2017-09-191-0/+1
* | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-09-131-3/+4
|\ \ | |/
| * Bump grape_logging gem to 1.7.0 to get status codes for error messagessh-bump-grape-logging-for-status-codesStan Hu2017-09-101-1/+1
| * Merge branch 'sh-add-grape-logging' into 'master'Sean McGivern2017-09-071-0/+1
| |\
| | * Add JSON logger in `log/api_json.log` for Grape API endpointsStan Hu2017-09-061-0/+1
| * | Merge branch '37411-update-omniauth-google-oauth2' into 'master'Douwe Maan2017-09-071-1/+1
| |\ \
| | * | Update the omniauth-google-oauth2 gem to 0.5.237411-update-omniauth-google-oauth2Rémy Coutable2017-09-071-1/+1
| * | | Merge branch 'gitaly-tree-entries-fix' into 'master'Rémy Coutable2017-09-071-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-061-1/+1
| | |/
| * | Merge branch 'rs-update-capybara' into 'master'Rémy Coutable2017-09-071-1/+1
| |\ \ | | |/ | |/|
| | * Update capybara 2.6.2 -> 2.15.1Robert Speicher2017-09-051-1/+1
| * | Merge branch 'sh-bump-jira-gem' into 'master'Robert Speicher2017-09-051-1/+1
| |\ \
| | * | Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxiesStan Hu2017-09-051-1/+1
| | |/
* | | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-09-051-1/+3
|\ \ \ | |/ /
| * | Migrate Gitlab::Git::Repository#find_branch to GitalyAhmad Sherif2017-09-051-1/+1
| |/
| * Add a linter for PO filesBob Van Landuyt2017-08-311-0/+2
* | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-311-13/+7
|\ \ | |/
| * Upgrade mail and nokogiri gems due to security issuesMarkus Koller2017-08-311-7/+4
| * Update Prometheus Client MMAP gem to version that fixes performance degradati...pawel/bump_prometheus_client_mmap_version_to_fix_performance_degradationPawel Chojnacki2017-08-291-1/+1
| * Update rubocop-gitlab-security to 0.1.0rs-update-rubocop-gitlab-securityRobert Speicher2017-08-281-1/+1
| * Merge branch 'gitaly-gem-rename' into 'master'Sean McGivern2017-08-251-1/+1
| |\
| | * Use gitaly-proto 0.31.0gitaly-gem-renameJacob Vosmaer2017-08-241-1/+1
| * | Remove underscore-rails gemrs-remove-underscore-railsRobert Speicher2017-08-231-3/+0
| |/
* | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-231-2/+2
|\ \ | |/
| * Merge branch '36806-update-rbnacl' into 'master'Douwe Maan2017-08-231-1/+1
| |\