Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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> | ||||
* | | Merge branch 'sh-use-grape-path-helpers' into 'master' | Sean McGivern | 2018-05-30 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Replace grape-route-helpers with our own grape-path-helpers Closes #45718 See merge request gitlab-org/gitlab-ce!19240 | ||||
| * | | Replace grape-route-helpers with our own grape-path-helpers | Stan Hu | 2018-05-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gem (https://gitlab.com/gitlab-org/grape-path-helpers) makes a number of changes: 1. Brings in @mdelaossa's changes in https://github.com/reprah/grape-route-helpers/pull/21 2. Fixes some broken specs and code for Grape 1.0+ 3. Optimizes the generation of paths by bringing in @dblessing's HashWithIndifferentAccess changes in https://gitlab.com/gitlab-org/gitlab-ce/issues/45718#note_70123793 Closes #45718 | ||||
* | | | Merge branch 'bump-kubeclient-version-3-1-0' into 'master' | Rémy Coutable | 2018-05-30 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | Bumps kubeclient gem version to 3.1.0 See merge request gitlab-org/gitlab-ce!19199 | ||||
| * | | Bumps kubeclient gem version to 3.1.0bump-kubeclient-version-3-1-0 | Tiago Botelho | 2018-05-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '46844-update-awesome_print-to-1-8-0' into 'master' | Dmitriy Zaporozhets | 2018-05-30 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Update awesome_print to 1.8.0 Closes #46844 See merge request gitlab-org/gitlab-ce!19163 | ||||
| * | | Update awesome_print to 1.8.0 | Takuya Noguchi | 2018-05-29 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch '46849-update-rdoc-to-6-0-4' into 'master' | Robert Speicher | 2018-05-29 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | Update rdoc to 6.0.4 Closes #46849 See merge request gitlab-org/gitlab-ce!19167 | ||||
| * | Update rdoc to 6.0.4 | Takuya Noguchi | 2018-05-27 | 1 | -1/+1 |
| | | |||||
* | | Use Gitaly's DeleteAllRepositories RPC during backup restore | Jacob Vosmaer (GitLab) | 2018-05-28 | 1 | -1/+1 |
| | | |||||
* | | Update redis-namespace to 1.6.0 | Takuya Noguchi | 2018-05-26 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'bootstrap4' into 'master' | Mike Greiling | 2018-05-25 | 1 | -1/+0 |
|\ | | | | | | | | | | | | | Upgrade to Bootstrap 4 Closes #45185 and #46710 See merge request gitlab-org/gitlab-ce!18232 | ||||
| * | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-05-22 | 1 | -1/+4 |
| |\ | |||||
| * | | Remove bootstrap-sass gem | Clement Ho | 2018-05-22 | 1 | -1/+0 |
| | | | |||||
* | | | Bumped omniauth-authentiq to 0.3.3 | Alexandros Keramidas | 2018-05-24 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Bump prometheus-client-mmap to 0.9.3 to fix nil exception errorsh-bump-prometheus-client-mmap | Stan Hu | 2018-05-22 | 1 | -1/+1 |
| | | | | | | | | See https://gitlab.com/gitlab-org/prometheus-client-mmap/issues/24 | ||||
* | | Merge branch 'ce-5928-geo-rake-task-to-force-housekeeping-on-next-sync' into ↵ | Nick Thomas | 2018-05-21 | 1 | -0/+3 |
|\ \ | |/ |/| | | | | | | | | | 'master' Backport from EE: Adding Progressbar explicitly and spec extensions for it See merge request gitlab-org/gitlab-ce!18885 | ||||
| * | Adding progressbar explicitly and spec extensions for itce-5928-geo-rake-task-to-force-housekeeping-on-next-sync | Gabriel Mazetto | 2018-05-10 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'blackst0ne-remove-spinach' into 'master' | Rémy Coutable | 2018-05-15 | 1 | -3/+0 |
|\ \ | | | | | | | | | | | | | | | | | | | Remove Spinach Closes #23036 See merge request gitlab-org/gitlab-ce!18869 | ||||
| * | | Clean up Gemfile | blackst0ne | 2018-05-14 | 1 | -3/+0 |
| | | | |||||
* | | | Merge branch 'update-sidekiq' into 'master' | Rémy Coutable | 2018-05-14 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | update sidekiq 5.0 -> 5.1 See merge request gitlab-org/gitlab-ce!18765 | ||||
| * | | update sidekiq 5.0 -> 5.1 | Pirate Praveen | 2018-05-05 | 1 | -1/+1 |
| | | |