Age | Commit message (Collapse) | Author | |
---|---|---|---|
2017-07-26 | Merge remote-tracking branch 'dev/master' | Douwe Maan | |
# Conflicts: # Gemfile # Gemfile.lock | |||
2017-07-26 | Add net-ldap explicitly since we use it directly | Michael Kozono | |
And this has already been done on EE, so it’ll match now. | |||
2017-07-26 | Fix plain LDAP (no encryption) | Michael Kozono | |
2017-07-26 | Upgrade omniauth-ldap gem (and some dependencies) | Michael Kozono | |
Most notably, the net-ldap gem. | |||
2017-07-26 | Merge branch 'bump-omniauth-ldap-gem-version' into 'master' | Sean McGivern | |
Bumps Gitlab Omniauth LDAP version See merge request !13059 | |||
2017-07-25 | Merge branch 'upgrade_re2' into 'master' | Rémy Coutable | |
Upgrade re2 to support seperate CXX and CC passing See merge request !13064 | |||
2017-07-25 | Bumps Gitlab Omniauth LDAP version | Tiago Botelho | |
2017-07-25 | Resolve "More RESTful API: include resource URLs in responses" | Oswaldo Ferreira | |
2017-07-25 | Merge branch 'dz-update-shoulda' into 'master' | Rémy Coutable | |
Update shoulda-matchers gem to 3.1.2 See merge request !13040 | |||
2017-07-25 | Upgrade re2 to support seperate CXX and CC passing | Frank Groeneveld | |
2017-07-24 | Merge branch 'pawel/bump_prometheus_client_library' into 'master' | Sean McGivern | |
Fix bug causing truncation of Metrics files See merge request !13035 | |||
2017-07-24 | Update shoulda-matchers gem to 3.1.2 | Dmitriy Zaporozhets | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||
2017-07-24 | Upgrade the re2 gem to 1.1.0 | Nick Thomas | |
2017-07-24 | Fix bug with truncation of file containing metrics | Pawel Chojnacki | |
bump prometheus gem version | |||
2017-07-21 | Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master' | Robert Speicher | |
Migrate Gitlab::Git::Commit.find_all to Gitaly Closes gitaly#396 See merge request !12934 | |||
2017-07-21 | Merge branch 'dz-update-grape' into 'master' | Sean McGivern | |
Update grape gem See merge request !12992 | |||
2017-07-20 | Migrate Gitlab::Git::Commit.find_all to Gitaly | Ahmad Sherif | |
Closes gitaly#396 | |||
2017-07-20 | Merge branch 'feature/send-diff-limits-to-gitaly' into 'master' | Robert Speicher | |
Migrate DiffCollection limiting logic to Gitaly See merge request !12867 | |||
2017-07-20 | Update grape gem | Dmitriy Zaporozhets | |
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> | |||
2017-07-20 | Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3' | Douwe Maan | |
24570 use re2 for user supplied regexp 9 3 See merge request !2129 | |||
2017-07-19 | Migrate DiffCollection limiting logic to Gitaly | Ahmad Sherif | |
2017-07-19 | Merge branch 'authentiq-updates' into 'master' | Rémy Coutable | |
Added authentiq provider to tests and updated documentation, gem and config file. See merge request !12952 | |||
2017-07-19 | Update Prometheus gem to version that explicitly calls `munmap` | Paweł Chojnacki | |
2017-07-19 | Merge branch 'rc/bump-peek-performance_bar' into 'master' | Sean McGivern | |
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch See merge request !12939 | |||
2017-07-18 | Add structured logging for Rails processes | Stan Hu | |
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 | |||
2017-07-18 | Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch | Rémy Coutable | |
Signed-off-by: Rémy Coutable <remy@rymai.me> | |||
2017-07-18 | Merge branch '34831-remove-coffee-rails-gem' into 'master' | Jacob Schatz | |
Remove coffee-rails gem Closes #34831 See merge request !12715 | |||
2017-07-18 | Added authentiq provider to tests and updated documentation, gem and config ↵ | Alexandros Keramidas | |
file. | |||
2017-07-16 | Bump fog-core to 1.44.3 and fog providers' plugins to latest | Takuya Noguchi | |
2017-07-14 | Update the mysql2 gem to v0.4.5 | Nick Thomas | |
2017-07-12 | Merge branch '34858-bump-scss-lint-to-0-54-0' into 'master' | Rémy Coutable | |
Bump scss-lint to 0.54.0 Closes #34858 See merge request !12733 | |||
2017-07-11 | Merge branch '34867-remove-net-ssh-gem' into 'master' | Rémy Coutable | |
Remove net-ssh gem Closes #34867 See merge request !12736 | |||
2017-07-11 | Update Sidekiq from 5.0.0 to 5.0.4 | Stan Hu | |
See: https://github.com/mperham/sidekiq/blob/master/Changes.md | |||
2017-07-10 | Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'" | Marin Jankovski | |
This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56. | |||
2017-07-09 | Remove net-ssh gem | Takuya Noguchi | |
2017-07-08 | Bump scss-lint to 0.54.0 | Takuya Noguchi | |
2017-07-07 | Add gitaly_git_blob_raw feature | Jacob Vosmaer | |
2017-07-07 | Remove coffee-rails gem | Takuya Noguchi | |
2017-07-07 | Merge branch 'feature/migrate-commit-count-to-gitaly' into 'master' | Robert Speicher | |
Migrate Gitlab::Git::Repository#commit_count to Gitaly Closes gitaly#355 See merge request !12688 | |||
2017-07-07 | Migrate Gitlab::Git::Repository#commit_count to Gitaly | Ahmad Sherif | |
Closes gitaly#355 | |||
2017-07-05 | Merge branch 'update-raven-253' into 'master' | Sean McGivern | |
Update sentry-raven from 2.4.0 to 2.5.3 See merge request !12605 | |||
2017-07-04 | Merge branch 'master' into ↵ | Paweł Chojnacki | |
'bump-prometheus-version-to-fix-text-representation-problem' # Conflicts: # Gemfile.lock | |||
2017-07-04 | Instrument Unicorn with Ruby exporter | Paweł Chojnacki | |
2017-07-04 | Update prometheus client gem | Pawel Chojnacki | |
2017-07-03 | Update sentry-raven from 2.4.0 to 2.5.3 | Gabriel Mazetto | |
2.5.x branch have updated performance and additional fixes | |||
2017-06-27 | Merge branch '34221-fix-missing-method-in-mmap2-gem' into 'master' | Douwe Maan | |
Update mmap2 gem to fix missing symbol error that happens on some installations from source Closes #34221 See merge request !12492 | |||
2017-06-27 | Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses ↵ | Pawel Chojnacki | |
method that is no longer part of Ruby API | |||
2017-06-27 | Merge branch 'bugfix/ruby2.4-compat' into 'master' | Douwe Maan | |
ruby 2.4 compat: update to webmock 2.3.2 See merge request !12471 | |||
2017-06-27 | Merge branch 'update_bootsnap_1.1.1' into 'master' | Robert Speicher | |
Bump bootsnap to 1.1.1 Closes #34084 See merge request !12425 | |||
2017-06-27 | ruby 2.4 compat: update to webmock 2.3.2 | http://jneen.net/ | |