Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Stop using Flay | Rémy Coutable | 2018-09-03 | 1 | -1/+0 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Upgrade LicenseFinder Gem to v5.4.0 | Winnie Hellmann | 2018-08-30 | 1 | -1/+1 |
| | |||||
* | Allow whitelisting for "external collaborator by default" setting | Roger Rüttimann | 2018-08-30 | 1 | -0/+3 |
| | |||||
* | Bump fog-google to 1.7.1 and google-api-client to 0.23.0sh-bump-fog-google | Stan Hu | 2018-08-21 | 1 | -2/+2 |
| | | | | | | | This is needed to support query parameters in `Fog::Storage::Google`. See https://github.com/fog/fog-google/pull/409. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49957 | ||||
* | Remove Gemnasium service | Gilbert Roulot | 2018-08-20 | 1 | -3/+0 |
| | |||||
* | Fix merge requests not showing any diff files for big patches49907-commits-and-merge-requests-does-not-list-all-files-when-one-file-exceeds-size-limits | Alejandro Rodríguez | 2018-08-17 | 1 | -1/+1 |
| | |||||
* | Fix `bin/secpick` rainbow gem error, and security branch prefixing | Michael Kozono | 2018-08-15 | 1 | -1/+1 |
| | |||||
* | Backport some changes from gitlab-org/gitlab-ee!6767 | Rubén Dávila | 2018-08-07 | 1 | -1/+1 |
| | |||||
* | Bump prometheus-client-mmap to 0.9.4 | Stan Hu | 2018-07-28 | 1 | -1/+1 |
| | | | | | | | Fixes failing builds with gcc on Archlinux and Ruby 2.4.4. See https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/26 for more details. | ||||
* | Merge branch 'sh-include-rbtrace' into 'master' | Douwe Maan | 2018-07-25 | 1 | -0/+1 |
|\ | | | | | | | | | Add rbtrace to Gemfile See merge request gitlab-org/gitlab-ce!20831 | ||||
| * | Add rbtrace to Gemfilesh-include-rbtrace | Stan Hu | 2018-07-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | This will be enabled if ENABLE_RBTRACE environment variable is defined. This will allow us to debug all sorts of issues in production: https://github.com/tmm1/rbtrace | ||||
* | | Use limit parameter to retrieve Wikis from Gitalysh-use-wiki-limit-parameter-gitaly | Stan Hu | 2018-07-24 | 1 | -1/+1 |
|/ | | | | | | | | Without this parameter, every load of a Wiki page will load all the Wiki pages in the repository for the sidebar. This is a significant performance penalty that can significant slow the display of all Wiki pages. Relates to #40101 | ||||
* | Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performancesh-bump-sanitize-4.6.6 | Stan Hu | 2018-07-23 | 1 | -1/+1 |
| | | | | | | sanitize 4.6.6 has this optimization that will benefit Markdown rendering: https://github.com/rgrove/sanitize/pull/183 nokogiri 1.4.4 has this memory leak fix: https://github.com/sparklemotion/nokogiri/pull/1771 | ||||
* | Merge branch 'hangouts_chat_integration' into 'master' | Sean McGivern | 2018-07-23 | 1 | -0/+3 |
|\ | | | | | | | | | Hangouts chat integration See merge request gitlab-org/gitlab-ce!20290 | ||||
| * | Add Hangouts Chat service implementation | Kukovskii Vladimir | 2018-07-14 | 1 | -0/+3 |
| | | |||||
* | | Add bootsnap to development/test bundle and enable it if available | Gabriel Mazetto | 2018-07-20 | 1 | -0/+1 |
| | | | | | | | | This will enable bootsnap whenver the gem is available. | ||||
* | | Incorporate Gitaly's RefService.FindAllRemoteBranches RPCgitaly-remote-branches | Alejandro Rodríguez | 2018-07-18 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'update-rubocop' | Sean McGivern | 2018-07-09 | 1 | -2/+2 |
|\ | |||||
| * | Use stable gitlab-styles and eliminate offenses | Lin Jen-Shin | 2018-07-09 | 1 | -1/+1 |
| | | |||||
| * | Update rubocop to get rid of a warning in other MR | Lin Jen-Shin | 2018-07-09 | 1 | -2/+2 |
| | | |||||
* | | Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045 | Matthew Dawson | 2018-07-08 | 1 | -1/+1 |
|/ | | | | | Also update the hook logs to escape the contents properly, as the :plain filter does not do html escaping. | ||||
* | Add Repository#set_config and #delete_config | Jacob Vosmaer | 2018-07-06 | 1 | -1/+1 |
| | |||||
* | Update OmniAuth Shibboleth gem to latest to gain support | Tom Downes | 2018-07-04 | 1 | -1/+1 |
| | | | | | | for handling multi-valued SAML assertions. Add documentation of label argument for omniauth provider to override text in login button. | ||||
* | update html-pipeline 2.7.1 -> 2.8 | Pirate Praveen | 2018-06-30 | 1 | -1/+1 |
| | |||||
* | Don't hash user ID in OIDC subject claim | Markus Koller | 2018-06-28 | 1 | -1/+1 |
| | |||||
* | Gitaly metrics check for read/writeability | Zeger-Jan van de Weg | 2018-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Prior to this change, health checks checked for writeability of the NFS shards. Given we're moving away from that, this patch extends the checks for Gitaly to check for read and writeability. Potentially some dashboards will break, as over time these metrics will no longer appear as Prometheus doesn't get the data anymore. Observability in the circuit breaker will be reduced, but its not expected to be turned on and the circuit breaker is being removed soon too. Closes https://gitlab.com/gitlab-org/gitaly/issues/1218 | ||||
* | Merge branch 'security-fj-bumping-sanitize-gem' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+1 |
|\ | | | | | | | | | [master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability See merge request gitlab/gitlabhq!2399 | ||||
| * | Update gitlab-gollum-lib to 4.2.7.5 and sanitize to 4.6.5 | Francisco Javier López | 2018-06-15 | 1 | -1/+1 |
| | | |||||
* | | Remove remaining traces of the Allocations Gemremove-allocations-gem | Yorick Peterse | 2018-06-20 | 1 | -1/+0 |
| | | | | | | | | | | | | | | In MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15834 we removed use of the data produced by the Allocations Gem. However, we never removed the code that just enables tracking of allocations. In this commit we remove all remaining traces of this Gem. | ||||
* | | Migrate repo backup to gitaly | Ahmad Hassan | 2018-06-15 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'rs-update-rspec' into 'master' | Rémy Coutable | 2018-06-11 | 1 | -1/+1 |
|\ | | | | | | | | | Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449 | ||||
| * | Update rspec to 3.7 | Robert Speicher | 2018-06-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'upgrade-gitlab-markup' into 'master' | Douwe Maan | 2018-06-11 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Upgrade gitlab-markup to fix render issue with reStructuredText See merge request gitlab-org/gitlab-ce!19596 | ||||
| * | | Upgrade gitlab-markup to fix render issue with reStructuredText | Gabriel Mazetto | 2018-06-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'use-restore-custom-hooks-gitaly' into 'master' | Douwe Maan | 2018-06-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Use RestoreCustomHooks RPC in restore rake task See merge request gitlab-org/gitlab-ce!19370 | ||||
| * | | | Use RestoreCustomHooks RPC in restore rake task | Ahmad Hassan | 2018-06-07 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'feature/customizable-favicon' into 'master' | Douwe Maan | 2018-06-07 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497 | ||||
| * | | favicon uploader generating ci status favicons | Alexis Reigel | 2018-06-05 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'update-net-ssh' into 'master' | Grzegorz Bizon | 2018-06-07 | 1 | -3/+2 |
|\ \ \ | |_|/ |/| | | | | | | | | update net-ssh 4 -> 5, remove rbnacl, rbnacl-libsodium (not needed) See merge request gitlab-org/gitlab-ce!19412 | ||||
| * | | update net-ssh 4 -> 5, remove rbnacl, rbnacl-libsodium (not needed) | Pirate Praveen | 2018-06-06 | 1 | -3/+2 |
| |/ | |||||
* | | Initial setup GraphQL using graphql-ruby 1.8 | Bob Van Landuyt | 2018-06-06 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | - All definitions have been replaced by classes: http://graphql-ruby.org/schema/class_based_api.html - Authorization & Presentation have been refactored to work in the class based system - Loaders have been replaced by resolvers - Times are now coersed as ISO 8601 | ||||
* | | Convert from GraphQL::Batch to BatchLoader | Nick Thomas | 2018-06-05 | 1 | -1/+0 |
| | | |||||
* | | Add a minimal GraphQL API | Nick Thomas | 2018-06-05 | 1 | -0/+6 |
|/ | |||||
* | Merge branch '46845-update-email_spec-to-2-2-0' into 'master' | Robert Speicher | 2018-06-04 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Update email_spec to 2.2.0 Closes #46845 See merge request gitlab-org/gitlab-ce!19164 | ||||
| * | Update email_spec to 2.2.0 | Takuya Noguchi | 2018-06-03 | 1 | -1/+1 |
| | | |||||
* | | Bump octokit to 4.947193-uri-invalidurierror-bad-uri-is-not-uri-users-xxx-bot | Ash McKenzie | 2018-06-04 | 1 | -1/+1 |
| | | |||||
* | | Update selenium-webdriver to 3.12.0 | Takuya Noguchi | 2018-06-04 | 1 | -1/+1 |
|/ | |||||
* | Export assigned issues in iCalendar feed | Imre Farkas | 2018-05-31 | 1 | -0/+3 |
| | |||||
* | Merge branch 'dz-awesome-print-version-unlock' into 'master' | Robert Speicher | 2018-05-30 | 1 | -1/+1 |
|\ | | | | | | | | | Remove version lock on awesome_print dependency See merge request gitlab-org/gitlab-ce!19232 | ||||
| * | Remove version lock on awesome_print dependency | Dmitriy Zaporozhets | 2018-05-30 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> |