summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Use google-protobuf 3.4.0.2google-protobuf-3.4.0.2Jacob Vosmaer2017-08-241-1/+1
|
* Merge branch '36806-update-rbnacl' into 'master'Douwe Maan2017-08-231-3/+3
|\ | | | | | | | | | | | | Update the rbnacl gem to 4.0.2 Closes #36806 See merge request !13740
| * Update the rbnacl gem to 4.0.2Nick Thomas2017-08-221-3/+3
| |
* | Merge branch 'gitaly-commit-patch' into 'master'Sean McGivern2017-08-231-2/+2
|\ \ | |/ |/| | | | | | | | | Incorporate DiffService.CommitPatch Gitaly RPC Closes gitaly#463 See merge request !13441
| * Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patchAlejandro Rodríguez2017-08-221-2/+2
| |
* | Merge branch 'rouge-2.2.0' into 'master'Sean McGivern2017-08-211-1/+1
|\ \ | |/ |/| | | | | | | | | Bump rouge to 2.2.0 Closes #36554 See merge request !13633
| * Bump rouge to v2.2.0pbr2017-08-191-1/+1
| |
* | Update prometheus mmap client library to fix performance issues when ↵pawel/update_prometheus_client_gem_to_improve_performance_when_rendering_metricsPawel Chojnacki2017-08-181-2/+2
| | | | | | | | rendering many metrics.
* | Client Implementation: RefService::RefExistsgitaly_ref_existsAndrew Newdigate2017-08-181-2/+2
| |
* | Merge branch 'ee-2628-backport-to-ce' into 'master'Douwe Maan2017-08-171-3/+0
|\ \ | | | | | | | | | | | | Backports EE mirror stuck handling feature… See merge request !13627
| * | Backports EE mirror stuck handling feature ↵ee-2628-backport-to-ceTiago Botelho2017-08-171-3/+0
| | | | | | | | | | | | (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE
* | | Use grpc 1.4.5grpc-1.4.5Jacob Vosmaer2017-08-171-1/+1
| |/ |/|
* | Upgrade grape to 1.0Zeger-Jan van de Weg2017-08-161-9/+6
| | | | | | | | | | Main feature was the deprication of the Hashie stuff, so the access by calling keys as method is gone now.
* | Use charlock_holmes 0.7.5Jacob Vosmaer2017-08-161-2/+2
|/
* Merge branch '35804-document-table-based-tests' into 'master'Robert Speicher2017-08-141-0/+33
|\ | | | | | | | | | | | | Use rspec-parameterized for table-based tests Closes #35804 See merge request !13469
| * Use rspec-parameterized for table-based testsNick Thomas2017-08-111-0/+33
| |
* | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-141-4/+13
| | | | | | | | | | | | | | | | | | | | This changes the pagination of the "Explore" pages so they use a simpler pagination system that only shows "Prev" and "Next" buttons. This removes the need for getting the total number of rows to display, a process that can easily take up to 2 seconds when browsing through a large list of projects. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27390
* | Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master'Robert Speicher2017-08-111-2/+2
|\ \ | | | | | | | | | | | | Migrate force push check to Gitaly See merge request !13406
| * | Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitalyAhmad Sherif2017-08-111-2/+2
| | |
* | | Bumps omniauth-ldap gem version to 2.0.4bump-omniauth-ldap-gem-version-2-0-4Tiago Botelho2017-08-111-2/+2
| |/ |/|
* | Updating Gemfile.lock for rubocop-rspec dependecy.jarv/update-gemfile-lockJohn Jarvis2017-08-091-0/+1
|/ | | | | | | | | | | | | GDK pipeline is failing with this error: ``` Downloading rubocop-rspec-1.15.1 revealed dependencies not in the API or the lockfile (rubocop (>= 0.42.0)). Either installing with `--full-index` or running `bundle update rubocop-rspec` should fix the problem. ``` Updated lockfile by running the bundle update. `gdk install` works now.
* Correct `Gemfile.lock` for latest rubocop-gitlab-security gemspecRobert Speicher2017-08-081-4/+4
|
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-081-1/+3
|
* Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-071-2/+2
|\ | | | | | | | | | | | | Migrate Gitlab::Git::Repository#size to Gitaly Closes gitaly#437 See merge request !13259
| * Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitalyAhmad Sherif2017-08-071-2/+2
| | | | | | | | Closes gitaly#437
* | Backport changes in ↵Nick Thomas2017-08-071-0/+10
|/ | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
* Upgrade haml_lint Gem to 0.26.0Winnie Hellmann2017-08-071-4/+5
|
* Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master'Robert Speicher2017-08-041-2/+2
|\ | | | | | | | | | | | | Migrate blame loading to Gitaly Closes gitaly#421 See merge request !13155
| * Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitalyAhmad Sherif2017-08-031-2/+2
| | | | | | | | Closes gitaly#421
* | Bump rspec to 3.6.0rs-update-rspecRobert Speicher2017-08-031-26/+22
|/
* Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitalyAhmad Sherif2017-08-021-2/+2
| | | | Closes gitaly#415
* Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1Takuya Noguchi2017-08-011-5/+7
|
* Bump google-protobuf to 3.3.0protobuf-bumpMatija Čupić2017-07-291-1/+1
|
* Migrate Repository#tags to Gitalyfeature/migrate-repository-tags-to-gitalyAhmad Sherif2017-07-271-2/+2
| | | | Closes gitaly#411
* Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master'Robert Speicher2017-07-271-2/+2
|\ | | | | | | | | Fix prometheus client pid reuse bug See merge request !13130
| * Update prometheus client gem to fix problems with PID handling followingpawel/prometheus_client_pid_reuse_errorPawel Chojnacki2017-07-271-2/+2
| | | | | | | | unicorn forking new workers.
* | update ruggedAlexis Reigel2017-07-271-2/+2
| | | | | | | | | | | | | | | | the rugged versions up to 0.26.0b3 had a bug concerning the signature extraction. The extracted signature was not always the same, probably due to a buffer (overflow) issue in libgit. see https://github.com/libgit2/rugged/issues/608
* | Prototype key verificationKevin O'Connor2017-07-271-0/+3
|/
* Merge remote-tracking branch 'dev/master'Douwe Maan2017-07-261-0/+1
|\ | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock
| * Add net-ldap explicitly since we use it directlyMichael Kozono2017-07-261-0/+1
| | | | | | | | And this has already been done on EE, so it’ll match now.
| * Fix plain LDAP (no encryption)Michael Kozono2017-07-261-2/+2
| |
| * Upgrade omniauth-ldap gem (and some dependencies)Michael Kozono2017-07-261-8/+8
| | | | | | | | Most notably, the net-ldap gem.
* | Merge branch 'bump-omniauth-ldap-gem-version' into 'master'Sean McGivern2017-07-261-8/+8
|\ \ | |/ |/| | | | | Bumps Gitlab Omniauth LDAP version See merge request !13059
| * Bumps Gitlab Omniauth LDAP versionbump-omniauth-ldap-gem-versionTiago Botelho2017-07-251-8/+8
| |
* | Merge branch 'upgrade_re2' into 'master'Rémy Coutable2017-07-251-2/+2
|\ \ | | | | | | | | | | | | Upgrade re2 to support seperate CXX and CC passing See merge request !13064
| * | Upgrade re2 to support seperate CXX and CC passingFrank Groeneveld2017-07-251-2/+2
| |/
* | Resolve "More RESTful API: include resource URLs in responses"Oswaldo Ferreira2017-07-251-0/+5
| |
* | Merge branch 'dz-update-shoulda' into 'master'Rémy Coutable2017-07-251-3/+3
|\ \ | |/ |/| | | | | Update shoulda-matchers gem to 3.1.2 See merge request !13040
| * Update shoulda-matchers gem to 3.1.2Dmitriy Zaporozhets2017-07-241-3/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'pawel/bump_prometheus_client_library' into 'master'Sean McGivern2017-07-241-1/+1
|\ \ | | | | | | | | | | | | Fix bug causing truncation of Metrics files See merge request !13035
View Lorry Controller Status