summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Update the rbnacl gem to 4.0.2Nick Thomas2017-08-221-1/+1
| * | Merge branch 'gitaly-commit-patch' into 'master'Sean McGivern2017-08-231-1/+1
| |\ \ | | |/ | |/|
| | * Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patchAlejandro Rodríguez2017-08-221-1/+1
* | | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-211-1/+1
|\ \ \ | |/ /
| * | Only require sidekiq-limit_fetch when enabled in settingsonly-limit-fetch-when-requestedSean McGivern2017-08-211-1/+1
| |/
* | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-181-6/+4
|\ \ | |/
| * Update prometheus mmap client library to fix performance issues when renderin...pawel/update_prometheus_client_gem_to_improve_performance_when_rendering_metricsPawel Chojnacki2017-08-181-1/+1
| * Client Implementation: RefService::RefExistsgitaly_ref_existsAndrew Newdigate2017-08-181-1/+1
| * Merge branch 'ee-2628-backport-to-ce' into 'master'Douwe Maan2017-08-171-2/+0
| |\
| | * Backports EE mirror stuck handling feature (https://gitlab.com/gitlab-org/git...ee-2628-backport-to-ceTiago Botelho2017-08-171-2/+0
| * | Upgrade grape to 1.0Zeger-Jan van de Weg2017-08-161-2/+2
* | | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-171-1/+1
|\ \ \ | |/ /
| * | Use charlock_holmes 0.7.5Jacob Vosmaer2017-08-161-1/+1
| |/
* | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-161-1/+2
|\ \ | |/
| * Merge branch '35804-document-table-based-tests' into 'master'Robert Speicher2017-08-141-0/+1
| |\
| | * Use rspec-parameterized for table-based testsNick Thomas2017-08-111-0/+1
| * | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-141-1/+1
* | | Bump selenium-webdriver to 3.5.0 to make Capybara work properlyStan Hu2017-08-121-1/+1
* | | Bump Capybara version for Chrome headless fixesStan Hu2017-08-121-1/+1
* | | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-111-2/+2
|\ \ \ | |/ /
| * | Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master'Robert Speicher2017-08-111-1/+1
| |\ \
| | * | Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitalyAhmad Sherif2017-08-111-1/+1
| * | | Bumps omniauth-ldap gem version to 2.0.4bump-omniauth-ldap-gem-version-2-0-4Tiago Botelho2017-08-111-1/+1
| | |/ | |/|