summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Update charlock_holmeszj-fix-charlock_holmesZeger-Jan van de Weg2017-08-141-1/+1
| | | | | | | The compiler needs to be pinned to c++11, which is done by https://github.com/brianmario/charlock_holmes/commit/51d8a2f0eb1e9d3e476482727d4122b3d11b2bc6 Without this patch it won't install charlock_holmes on newer compilers.
* 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
| * | Fix bug with truncation of file containing metricsPawel Chojnacki2017-07-241-1/+1
| |/ | | | | | | bump prometheus gem version
* | Upgrade the re2 gem to 1.1.0Nick Thomas2017-07-241-2/+2
|/
* Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'Robert Speicher2017-07-211-2/+2
|\ | | | | | | | | | | | | Migrate Gitlab::Git::Commit.find_all to Gitaly Closes gitaly#396 See merge request !12934
| * Migrate Gitlab::Git::Commit.find_all to Gitalyfeature/migrate-commit-find-all-to-gitalyAhmad Sherif2017-07-201-2/+2
| | | | | | | | Closes gitaly#396
* | Merge branch 'dz-update-grape' into 'master'Sean McGivern2017-07-211-8/+6
|\ \ | |/ |/| | | | | Update grape gem See merge request !12992
| * Update grape gemdz-update-grapeDmitriy Zaporozhets2017-07-201-8/+6
| | | | | | | | | | | | | | | | New version of the gem returns 200 status code on delete with content instead of 204 so we explicitly set status code to keep existing behavior Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'feature/send-diff-limits-to-gitaly' into 'master'Robert Speicher2017-07-201-2/+2
|\ \ | |/ |/| | | | | Migrate DiffCollection limiting logic to Gitaly See merge request !12867
| * Migrate DiffCollection limiting logic to Gitalyfeature/send-diff-limits-to-gitalyAhmad Sherif2017-07-191-2/+2
| |
* | Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'Douwe Maan2017-07-191-0/+2
|/ | | | | | 24570 use re2 for user supplied regexp 9 3 See merge request !2129
* Merge branch 'authentiq-updates' into 'master'Rémy Coutable2017-07-191-2/+2
|\ | | | | | | | | Added authentiq provider to tests and updated documentation, gem and config file. See merge request !12952
| * Added authentiq provider to tests and updated documentation, gem and config ↵Alexandros Keramidas2017-07-181-2/+2
| | | | | | | | file.
* | Update Prometheus gem to version that explicitly calls `munmap`Paweł Chojnacki2017-07-191-2/+2
| |
* | Merge branch 'rc/bump-peek-performance_bar' into 'master'Sean McGivern2017-07-191-2/+2
|\ \ | | | | | | | | | | | | Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch See merge request !12939
| * | Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patchrc/bump-peek-performance_barRémy Coutable2017-07-181-2/+2
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Add structured logging for Rails processessh-structured-loggingStan Hu2017-07-181-0/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces JSON logging for Rails views saved to a file called `development_json.log`, `production_json.log`, etc. For example, instead of this unparsable log: ``` Started GET "/" for 127.0.0.1 at 2012-03-10 14:28:14 +0100 Processing by HomeController#index as HTML Rendered text template within layouts/application (0.0ms) Rendered layouts/_assets.html.erb (2.0ms) Rendered layouts/_top.html.erb (2.6ms) Rendered layouts/_about.html.erb (0.3ms) Rendered layouts/_google_analytics.html.erb (0.4ms) Completed 200 OK in 79ms (Views: 78.8ms | ActiveRecord: 0.0ms) ``` We get a single line with this: ``` {"method":"GET","path":"/,"format":"html","controller":"HomeController","action":"index","status":200,"duration":79,"view":78.8,"db":0.0,"location":"http://localhost/","time":"2017-07-18 09:35:17 -0700"} ``` Part of #20060
* | Merge branch '34831-remove-coffee-rails-gem' into 'master'Jacob Schatz2017-07-171-8/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove coffee-rails gem Closes #34831 See merge request !12715
View Lorry Controller Status