| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'feature/customizable-favicon' into 'master' | Douwe Maan | 2018-06-07 | 1 | -0/+2 |
| |\ | | | | | | | | | | | | | 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/+2 |
| | | | |||||
| * | | Merge branch 'sh-bump-grape-path-helpers' into 'master' | Sean McGivern | 2018-06-07 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | Bump grape-path-helpers to solve a bug in GrapePathHelpers::NamedRouteMatcher See merge request gitlab-org/gitlab-ce!19506 | ||||
| | * | | Bump grape-path-helpers to solve a bug in GrapePathHelpers::NamedRouteMatcher | Stan Hu | 2018-06-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | If you include this helper with a class that also implements `method_missing`, this would result in AbstractController::DoubleRenderError. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19487#note_79096902. | ||||
| * | | | Merge branch 'update-net-ssh' into 'master' | Grzegorz Bizon | 2018-06-07 | 1 | -8/+4 |
| |\ \ \ | |/ / |/| | | | | | | | | 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 | -8/+4 |
| | |/ | |||||
| * | | Merge branch 'bvl-graphql-start-34754' into 'master' | Douwe Maan | 2018-06-06 | 1 | -0/+6 |
| |\ \ | | | | | | | | | | | | | | | | | | | GraphQL setup: Basic Project and Merge request endpoint Closes #34754 See merge request gitlab-org/gitlab-ce!19008 | ||||
| | * | | Initial setup GraphQL using graphql-ruby 1.8 | Bob Van Landuyt | 2018-06-06 | 1 | -12/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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/+17 |
| | |/ | |||||
| * | | Bump grape-path-helpers to 1.0.2 to get updated Rake task naming | Stan Hu | 2018-06-06 | 1 | -1/+1 |
| |/ | | | | Add development documentation on how to generate a list of routes | ||||
| * | Merge branch 'update-doorkeeper' into 'master' | Rémy Coutable | 2018-06-04 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Update Doorkeeper OpenID for Kubernetes support Closes #44485 See merge request gitlab-org/gitlab-ce!19293 | ||||
| | * | Update Doorkeeper OpenID for Kubernetes support | Maxime Guyot | 2018-05-31 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch '46845-update-email_spec-to-2-2-0' into 'master' | Robert Speicher | 2018-06-04 | 1 | -3/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | 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 | -3/+4 |
| | | | | |||||
| * | | | Bump octokit to 4.947193-uri-invalidurierror-bad-uri-is-not-uri-users-xxx-bot | Ash McKenzie | 2018-06-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update selenium-webdriver to 3.12.0 | Takuya Noguchi | 2018-06-04 | 1 | -4/+4 |
| |/ / | |||||
| * | | Bump omniauth-gitlab to 1.0.3 | Stan Hu | 2018-06-01 | 1 | -1/+1 |
| |/ | | | | | | This version of the gem uses API v4 by default: https://github.com/linchus/omniauth-gitlab/commit/fd13de9f251fdaa72ba0195bda47cd2cb8731084 | ||||
| * | Export assigned issues in iCalendar feed | Imre Farkas | 2018-05-31 | 1 | -0/+2 |
| | | |||||
| * | 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 | -6/+6 |
| |\ \ | | | | | | | | | | | | | | | | | | | 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 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -5/+5 |
| |\ \ \ | |_|/ |/| | | | | | | | | 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 | -5/+5 |
| | | | | |||||
| * | | | Merge branch '46844-update-awesome_print-to-1-8-0' into 'master' | Dmitriy Zaporozhets | 2018-05-30 | 1 | -2/+2 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | 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 | -2/+2 |
| | |/ | |||||
| * | | Bump rugged to 0.27.1 for security fixes | Stan Hu | 2018-05-29 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch '46849-update-rdoc-to-6-0-4' into 'master' | Robert Speicher | 2018-05-29 | 1 | -3/+2 |
| |\ \ | |/ |/| | | | | | | | | | 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 | -3/+2 |
| | | | |||||
| * | | Use Gitaly's DeleteAllRepositories RPC during backup restore | Jacob Vosmaer (GitLab) | 2018-05-28 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch '46846-update-redis-namespace-to-1-6-0' into 'master' | Rémy Coutable | 2018-05-28 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | Update redis-namespace to 1.6.0 Closes #46846 See merge request gitlab-org/gitlab-ce!19166 | ||||
| | * | | Update redis-namespace to 1.6.0 | Takuya Noguchi | 2018-05-26 | 1 | -3/+3 |
| | |/ | |||||
| * | | Update unicode-display_width from 1.3.0 to 1.3.2 | Lukas Eipert | 2018-05-27 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'bootstrap4' into 'master' | Mike Greiling | 2018-05-25 | 1 | -7/+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 | -2/+3 |
| | |\ | |||||
| | * | | Update gemfile.lock | Clement Ho | 2018-05-22 | 1 | -7/+0 |
| | | | | |||||
| * | | | Bumped omniauth-authentiq to 0.3.3 | Alexandros Keramidas | 2018-05-24 | 1 | -4/+5 |
| | |/ |/| | |||||
| * | | Bump prometheus-client-mmap to 0.9.3 to fix nil exception errorsh-bump-prometheus-client-mmap | Stan Hu | 2018-05-22 | 1 | -2/+2 |
| | | | | | | | | | 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/+1 |
| |\ \ | |/ |/| | | | | | | | | | '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/+1 |
| | | | |||||
| * | | Merge branch 'blackst0ne-remove-spinach' into 'master' | Rémy Coutable | 2018-05-15 | 1 | -17/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | Remove Spinach Closes #23036 See merge request gitlab-org/gitlab-ce!18869 | ||||
| | * | | Clean up Gemfile | blackst0ne | 2018-05-14 | 1 | -17/+0 |
| | | | | |||||
| * | | | Merge branch 'update-sidekiq' into 'master' | Rémy Coutable | 2018-05-14 | 1 | -3/+3 |
| |\ \ \ | |/ / |/| | | | | | | | | 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 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'update-gon' into 'master' | Robert Speicher | 2018-05-10 | 1 | -3/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | Update gon ~> 6.1.0 to ~> 6.2 See merge request gitlab-org/gitlab-ce!18764 | ||||
| | * | | | Update gon ~> 6.1.0 to ~> 6.2 | Pirate Praveen | 2018-05-05 | 1 | -3/+2 |
| | |/ / | |||||
| * | | | Merge branch 'sh-reset-prometheus-metrics-tests' into 'master' | Nick Thomas | 2018-05-10 | 1 | -2/+2 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Support resetting of Prometheus metrics between test runs Closes #39968 See merge request gitlab-org/gitlab-ce!18836 | ||||
| | * | | Support resetting of Prometheus metrics between test runs | Stan Hu | 2018-05-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | Adding the :prometheus tag to an rspec test will clear out memory-mapped files and reset the registry. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39968 | ||||
| * | | | Merge branch 'jivl-delete-d3-rails-gem' into 'master' | Douwe Maan | 2018-05-09 | 1 | -3/+0 |
| |\ \ \ | |/ / |/| | | | | | | | | Removed the d3_rails gem See merge request gitlab-org/gitlab-ce!18860 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |
path: root/Gemfile.lock