summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Don't require stackprof in GemfileRémy Coutable2017-08-091-1/+1
|/
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-081-0/+1
* Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-071-1/+1
|\
| * Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitalyAhmad Sherif2017-08-071-1/+1
* | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/25...Nick Thomas2017-08-071-0/+10
|/
* Upgrade haml_lint Gem to 0.26.0Winnie Hellmann2017-08-071-1/+1
* Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master'Robert Speicher2017-08-041-1/+1
|\
| * Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitalyAhmad Sherif2017-08-031-1/+1
* | Bump rspec to 3.6.0rs-update-rspecRobert Speicher2017-08-031-2/+2
|/
* Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitalyAhmad Sherif2017-08-021-1/+1
* Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1Takuya Noguchi2017-08-011-2/+2
* Migrate Repository#tags to Gitalyfeature/migrate-repository-tags-to-gitalyAhmad Sherif2017-07-271-1/+1
* Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master'Robert Speicher2017-07-271-1/+1
|\
| * Update prometheus client gem to fix problems with PID handling followingpawel/prometheus_client_pid_reuse_errorPawel Chojnacki2017-07-271-1/+1
* | update ruggedAlexis Reigel2017-07-271-1/+1
* | Prototype key verificationKevin O'Connor2017-07-271-0/+3
|/
* Merge remote-tracking branch 'dev/master'Douwe Maan2017-07-261-0/+1
|\
| * Add net-ldap explicitly since we use it directlyMichael Kozono2017-07-261-0/+1
| * Fix plain LDAP (no encryption)Michael Kozono2017-07-261-1/+1
| * Upgrade omniauth-ldap gem (and some dependencies)Michael Kozono2017-07-261-1/+1
* | Merge branch 'bump-omniauth-ldap-gem-version' into 'master'Sean McGivern2017-07-261-1/+1
|\ \ | |/ |/|
| * Bumps Gitlab Omniauth LDAP versionbump-omniauth-ldap-gem-versionTiago Botelho2017-07-251-1/+1
* | Merge branch 'upgrade_re2' into 'master'Rémy Coutable2017-07-251-1/+1
|\ \
| * | Upgrade re2 to support seperate CXX and CC passingFrank Groeneveld2017-07-251-1/+1
| |/
* | Resolve "More RESTful API: include resource URLs in responses"Oswaldo Ferreira2017-07-251-0/+1
* | Merge branch 'dz-update-shoulda' into 'master'Rémy Coutable2017-07-251-1/+1
|\ \ | |/ |/|
| * Update shoulda-matchers gem to 3.1.2Dmitriy Zaporozhets2017-07-241-1/+1
* | Upgrade the re2 gem to 1.1.0Nick Thomas2017-07-241-1/+1
|/
* Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'Robert Speicher2017-07-211-1/+1
|\
| * Migrate Gitlab::Git::Commit.find_all to Gitalyfeature/migrate-commit-find-all-to-gitalyAhmad Sherif2017-07-201-1/+1
* | Merge branch 'dz-update-grape' into 'master'Sean McGivern2017-07-211-1/+1
|\ \ | |/ |/|
| * Update grape gemdz-update-grapeDmitriy Zaporozhets2017-07-201-1/+1
* | Merge branch 'feature/send-diff-limits-to-gitaly' into 'master'Robert Speicher2017-07-201-1/+1
|\ \ | |/ |/|
| * Migrate DiffCollection limiting logic to Gitalyfeature/send-diff-limits-to-gitalyAhmad Sherif2017-07-191-1/+1
* | Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'Douwe Maan2017-07-191-0/+3
|/
* Merge branch 'authentiq-updates' into 'master'Rémy Coutable2017-07-191-1/+1
|\
| * Added authentiq provider to tests and updated documentation, gem and config f...Alexandros Keramidas2017-07-181-1/+1
* | Update Prometheus gem to version that explicitly calls `munmap`Paweł Chojnacki2017-07-191-1/+1
* | Merge branch 'rc/bump-peek-performance_bar' into 'master'Sean McGivern2017-07-191-1/+1
|\ \
| * | Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patchrc/bump-peek-performance_barRémy Coutable2017-07-181-1/+1
* | | Add structured logging for Rails processessh-structured-loggingStan Hu2017-07-181-0/+3
|/ /
* | Merge branch '34831-remove-coffee-rails-gem' into 'master'Jacob Schatz2017-07-171-1/+0
|\ \
| * | Remove coffee-rails gemTakuya Noguchi2017-07-081-1/+0
* | | Bump fog-core to 1.44.3 and fog providers' plugins to latestTakuya Noguchi2017-07-161-1/+1
* | | Update the mysql2 gem to v0.4.5Nick Thomas2017-07-141-1/+1
* | | Merge branch '34858-bump-scss-lint-to-0-54-0' into 'master'Rémy Coutable2017-07-121-1/+1
|\ \ \
| * | | Bump scss-lint to 0.54.0Takuya Noguchi2017-07-081-1/+1
| | |/ | |/|
View Lorry Controller Status