| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master' | Robert Speicher | 2017-08-04 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Migrate blame loading to Gitaly Closes gitaly#421 See merge request !13155 | ||||
| | * | Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitaly | Ahmad Sherif | 2017-08-03 | 1 | -2/+2 |
| | | | | | | | | | Closes gitaly#421 | ||||
| * | | Bump rspec to 3.6.0rs-update-rspec | Robert Speicher | 2017-08-03 | 1 | -26/+22 |
| |/ | |||||
| * | Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitaly | Ahmad Sherif | 2017-08-02 | 1 | -2/+2 |
| | | | | | Closes gitaly#415 | ||||
| * | Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1 | Takuya Noguchi | 2017-08-01 | 1 | -5/+7 |
| | | |||||
| * | Bump google-protobuf to 3.3.0protobuf-bump | Matija Čupić | 2017-07-29 | 1 | -1/+1 |
| | | |||||
| * | Migrate Repository#tags to Gitalyfeature/migrate-repository-tags-to-gitaly | Ahmad Sherif | 2017-07-27 | 1 | -2/+2 |
| | | | | | Closes gitaly#411 | ||||
| * | Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master' | Robert Speicher | 2017-07-27 | 1 | -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_error | Pawel Chojnacki | 2017-07-27 | 1 | -2/+2 |
| | | | | | | | | | unicorn forking new workers. | ||||
| * | | update rugged | Alexis Reigel | 2017-07-27 | 1 | -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 verification | Kevin O'Connor | 2017-07-27 | 1 | -0/+3 |
| |/ | |||||
| * | Merge remote-tracking branch 'dev/master' | Douwe Maan | 2017-07-26 | 1 | -0/+1 |
| |\ | | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock | ||||
| | * | Add net-ldap explicitly since we use it directly | Michael Kozono | 2017-07-26 | 1 | -0/+1 |
| | | | | | | | | | And this has already been done on EE, so it’ll match now. | ||||
| | * | Fix plain LDAP (no encryption) | Michael Kozono | 2017-07-26 | 1 | -2/+2 |
| | | | |||||
| | * | Upgrade omniauth-ldap gem (and some dependencies) | Michael Kozono | 2017-07-26 | 1 | -8/+8 |
| | | | | | | | | | Most notably, the net-ldap gem. | ||||
| * | | Merge branch 'bump-omniauth-ldap-gem-version' into 'master' | Sean McGivern | 2017-07-26 | 1 | -8/+8 |
| |\ \ | |/ |/| | | | | | Bumps Gitlab Omniauth LDAP version See merge request !13059 | ||||
| | * | Bumps Gitlab Omniauth LDAP versionbump-omniauth-ldap-gem-version | Tiago Botelho | 2017-07-25 | 1 | -8/+8 |
| | | | |||||
| * | | Merge branch 'upgrade_re2' into 'master' | Rémy Coutable | 2017-07-25 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | Upgrade re2 to support seperate CXX and CC passing See merge request !13064 | ||||
| | * | | Upgrade re2 to support seperate CXX and CC passing | Frank Groeneveld | 2017-07-25 | 1 | -2/+2 |
| | |/ | |||||
| * | | Resolve "More RESTful API: include resource URLs in responses" | Oswaldo Ferreira | 2017-07-25 | 1 | -0/+5 |
| | | | |||||
| * | | Merge branch 'dz-update-shoulda' into 'master' | Rémy Coutable | 2017-07-25 | 1 | -3/+3 |
| |\ \ | |/ |/| | | | | | Update shoulda-matchers gem to 3.1.2 See merge request !13040 | ||||
| | * | Update shoulda-matchers gem to 3.1.2 | Dmitriy Zaporozhets | 2017-07-24 | 1 | -3/+3 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge branch 'pawel/bump_prometheus_client_library' into 'master' | Sean McGivern | 2017-07-24 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | Fix bug causing truncation of Metrics files See merge request !13035 | ||||
| | * | | Fix bug with truncation of file containing metrics | Pawel Chojnacki | 2017-07-24 | 1 | -1/+1 |
| | |/ | | | | | | | bump prometheus gem version | ||||
| * | | Upgrade the re2 gem to 1.1.0 | Nick Thomas | 2017-07-24 | 1 | -2/+2 |
| |/ | |||||
| * | Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master' | Robert Speicher | 2017-07-21 | 1 | -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-gitaly | Ahmad Sherif | 2017-07-20 | 1 | -2/+2 |
| | | | | | | | | | Closes gitaly#396 | ||||
| * | | Merge branch 'dz-update-grape' into 'master' | Sean McGivern | 2017-07-21 | 1 | -8/+6 |
| |\ \ | |/ |/| | | | | | Update grape gem See merge request !12992 | ||||
| | * | Update grape gemdz-update-grape | Dmitriy Zaporozhets | 2017-07-20 | 1 | -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 Speicher | 2017-07-20 | 1 | -2/+2 |
| |\ \ | |/ |/| | | | | | Migrate DiffCollection limiting logic to Gitaly See merge request !12867 | ||||
| | * | Migrate DiffCollection limiting logic to Gitalyfeature/send-diff-limits-to-gitaly | Ahmad Sherif | 2017-07-19 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3' | Douwe Maan | 2017-07-19 | 1 | -0/+2 |
| |/ | | | | | | 24570 use re2 for user supplied regexp 9 3 See merge request !2129 | ||||
| * | Merge branch 'authentiq-updates' into 'master' | Rémy Coutable | 2017-07-19 | 1 | -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 Keramidas | 2017-07-18 | 1 | -2/+2 |
| | | | | | | | | | file. | ||||
| * | | Update Prometheus gem to version that explicitly calls `munmap` | Paweł Chojnacki | 2017-07-19 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'rc/bump-peek-performance_bar' into 'master' | Sean McGivern | 2017-07-19 | 1 | -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_bar | Rémy Coutable | 2017-07-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | Add structured logging for Rails processessh-structured-logging | Stan Hu | 2017-07-18 | 1 | -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 Schatz | 2017-07-17 | 1 | -8/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | Remove coffee-rails gem Closes #34831 See merge request !12715 | ||||
| | * | | Remove coffee-rails gem | Takuya Noguchi | 2017-07-08 | 1 | -8/+0 |
| | | | | |||||
| * | | | Bump fog-core to 1.44.3 and fog providers' plugins to latest | Takuya Noguchi | 2017-07-16 | 1 | -8/+8 |
| | | | | |||||
| * | | | Update the mysql2 gem to v0.4.5 | Nick Thomas | 2017-07-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch '34858-bump-scss-lint-to-0-54-0' into 'master' | Rémy Coutable | 2017-07-12 | 1 | -4/+4 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Bump scss-lint to 0.54.0 Closes #34858 See merge request !12733 | ||||
| | * | | | Bump scss-lint to 0.54.0 | Takuya Noguchi | 2017-07-08 | 1 | -4/+4 |
| | | |/ | |/| | |||||
| * | | | Merge branch '34867-remove-net-ssh-gem' into 'master' | Rémy Coutable | 2017-07-11 | 1 | -2/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove net-ssh gem Closes #34867 See merge request !12736 | ||||
| | * | | | Remove net-ssh gem | Takuya Noguchi | 2017-07-09 | 1 | -2/+0 |
| | |/ / | |||||
| * | | | Update Sidekiq from 5.0.0 to 5.0.4sh-bump-sidekiq | Stan Hu | 2017-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | See: https://github.com/mperham/sidekiq/blob/master/Changes.md | ||||
| * | | | Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'" | Marin Jankovski | 2017-07-10 | 1 | -4/+0 |
| |/ / | | | | | | | | | This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56. | ||||
| * | | Add gitaly_git_blob_raw feature | Jacob Vosmaer | 2017-07-07 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'feature/migrate-commit-count-to-gitaly' into 'master' | Robert Speicher | 2017-07-07 | 1 | -2/+2 |
| |\ \ | |/ |/| | | | | | | | | | Migrate Gitlab::Git::Repository#commit_count to Gitaly Closes gitaly#355 See merge request !12688 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |
path: root/Gemfile.lock