| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'remove-allocations-gem' into 'master' | Stan Hu | 2018-06-20 | 1 | -2/+0 |
| |\ | | | | | | | | | Remove remaining traces of the Allocations Gem See merge request gitlab-org/gitlab-ce!20029 | ||||
| | * | Remove remaining traces of the Allocations Gemremove-allocations-gem | Yorick Peterse | 2018-06-20 | 1 | -2/+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. | ||||
| * | | Merge branch 'sh-bump-rugged-0.27.2' into 'master' | Rémy Coutable | 2018-06-20 | 1 | -1/+1 |
| |\ \ | |/ |/| | | | | | Bump rugged to 0.27.2 See merge request gitlab-org/gitlab-ce!20026 | ||||
| | * | Bump rugged to 0.27.2sh-bump-rugged-0.27.2 | Stan Hu | 2018-06-20 | 1 | -1/+1 |
| | | | | | | | | | Release notes: https://github.com/libgit2/libgit2/releases/tag/v0.27.2 | ||||
| * | | Migrate repo backup to gitaly | Ahmad Hassan | 2018-06-15 | 1 | -2/+2 |
| |/ | |||||
| * | Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter | Francisco Javier López | 2018-06-12 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'rs-update-rspec' into 'master' | Rémy Coutable | 2018-06-11 | 1 | -17/+17 |
| |\ | | | | | | | | | Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449 | ||||
| | * | Update rspec to 3.7 | Robert Speicher | 2018-06-07 | 1 | -17/+17 |
| | | | |||||
| * | | Merge branch 'upgrade-gitlab-markup' into 'master' | Douwe Maan | 2018-06-11 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | 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 | -2/+2 |
| | | | | |||||
| * | | | Bump grape-path-helpers to 1.0.5 | blackst0ne | 2018-06-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'rails5-fix-47370' into 'master' | Douwe Maan | 2018-06-08 | 1 | -1/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use same gem versions for rails5 as for rails4 where possible Closes #47370, #46232, #47367, and #47373 See merge request gitlab-org/gitlab-ce!19498 | ||||
| | * | | | Use same gem versions for rails5 as for rails4 where possible | Jasper Maes | 2018-06-07 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'use-restore-custom-hooks-gitaly' into 'master' | Douwe Maan | 2018-06-08 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 | -2/+2 |
| | | |_|/ | |/| | | |||||
| * | | | | 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 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |
path: root/Gemfile.lock