summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '54093-the-default_value_for-gem-doesn-t-handle-actioncontroller...46166-add-constraints-that-prevent-ci_builds-from-being-associated-with-null-pipeline-projectSean McGivern2018-11-191-5/+8
|\
| * Use gitlab-default_value_with Rails 5Rémy Coutable2018-11-151-5/+8
* | Merge branch '54004-update-asana-to-0.8.1' into 'master'Sean McGivern2018-11-191-1/+1
|\ \
| * | Update asana to 0.8.1Takuya Noguchi2018-11-191-1/+1
* | | Merge branch 'sh-use-nakayoshi-fork' into 'master'Sean McGivern2018-11-191-0/+3
|\ \ \ | |/ / |/| |
| * | Improve memory performance by reducing dirty pages after fork()sh-use-nakayoshi-forkStan Hu2018-11-181-0/+3
| |/
* | Merge branch '54010-update-asciidoctor-to-1.5.8' into 'master'Rémy Coutable2018-11-191-1/+1
|\ \ | |/ |/|
| * Update asciidoctor to 1.5.8Takuya Noguchi2018-11-151-1/+1
* | Use the new parallel keyword in .gitlab-ci.ymluse-parallel-ci-keywordRémy Coutable2018-11-151-1/+1
|/
* Merge branch 'switch-rails' into 'master'Sean McGivern2018-11-141-1/+1
|\
| * Switch to Rails 5 by defaultJan Provaznik2018-11-141-1/+1
* | Bump `binding_of_caller` gem version to 0.8.0Shinya Maeda2018-11-141-1/+1
|/
* Merge branch '53289-update-haml_lint-to-0-28-0' into 'master'Rémy Coutable2018-11-131-1/+1
|\
| * Update haml_lint to 0.28.0Takuya Noguchi2018-10-291-1/+1
* | Merge branch '53291-update-ffaker-to-2-10-0' into 'master'Rémy Coutable2018-11-131-1/+1
|\ \
| * | Update ffaker to 2.10.0Takuya Noguchi2018-10-291-1/+1
| |/
* | Merge branch 'blackst0ne-add-discord-service' into 'master'Sean McGivern2018-11-121-0/+3
|\ \
| * | Update Gemfileblackst0ne2018-11-051-1/+1
| * | Add Discord integrationblackst0ne2018-10-301-0/+3
* | | Update gitlab-markup gem to avoid binary name collision53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markupAlejandro Rodríguez2018-11-111-1/+1
* | | Merge branch 'fj-41213-api-update-submodule-commit' into 'master'Sean McGivern2018-11-071-1/+1
|\ \ \
| * | | Add submodule update API endpointFrancisco Javier López2018-11-071-1/+1
| |/ /
* | | Merge branch 'remove-asset-sync' into 'master'Marin Jankovski2018-11-071-3/+0
|\ \ \ | |/ / |/| |
| * | Remove asset_sync gem and related coderemove-asset-syncBalasankar "Balu" C2018-10-251-3/+0
* | | Remove mousetrap-rails gemTakuya Noguchi2018-10-281-3/+0
| |/ |/|
* | Add experimental support for Pumaan-multithreadingAndrew Newdigate2018-10-251-0/+5
|/
* Bump google-protobuf to 3.6.1Stan Hu2018-10-241-2/+1
* Merge branch '44361-remove-gitlab-grit' into 'master'Rémy Coutable2018-10-171-5/+1
|\
| * Remove a dependency on gitlab-gollum-libNick Thomas2018-10-161-4/+0
| * Inline the gitlab-flowdock-git-hooks gemNick Thomas2018-10-161-1/+1
* | Merge branch 'grpc-update-1-15' into 'master'Rémy Coutable2018-10-161-1/+1
|\ \ | |/ |/|
| * Use grpc v1.15.xAlejandro Rodríguez2018-10-151-1/+1
* | Remove dependencies on LinguistZeger-Jan van de Weg2018-10-121-3/+1
|/
* Merge branch 'add_reliable_fetcher' into 'master'Nick Thomas2018-10-041-0/+1
|\
| * Add reliable fetcher for Sidekiqadd_reliable_fetcherValery Sizov2018-10-031-0/+1
* | Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez2018-10-021-3/+2
* | Merge branch '37433-solve-n-1-in-refs-controller-logs-tree' into 'master'Nick Thomas2018-10-011-1/+1
|\ \
| * | Removes N+1 gitaly rpc call to fetch the last commit for pathTiago Botelho2018-10-011-1/+1
* | | Merge branch 'master' into 'remove-dropzonejs-rails'Mike Greiling2018-09-281-82/+98
|\ \ \ | |/ /
| * | Merge branch '51299-update-grape' into 'master'Sean McGivern2018-09-261-1/+1
| |\ \ | | |/ | |/|
| | * Update grape to 1.1.0 to address a XSS vulnerability51299-update-grapeRémy Coutable2018-09-101-1/+1
| * | Remove background job throttling feature51509-remove-sidekiq-limit-fetchValery Sizov2018-09-241-1/+0
| * | Remove peek-sidekiqJan Provaznik2018-09-121-1/+0
| * | Bump Sidekiq 5.1.3 to 5.2.1Stan Hu2018-09-091-1/+1
| |/
| * Use gitaly-proto 0.117.0Douglas Barbosa Alexandre2018-09-061-1/+1
| * Merge branch 'sh-fix-attachments-inline' into 'master'Nick Thomas2018-09-061-1/+3
| |\
| | * Fix attachments not displaying inline with Google Cloud StorageStan Hu2018-09-051-1/+3
| * | Bump browser gem to v2.5.3Stan Hu2018-09-051-1/+1
| |/
| * Merge branch 'junit-results' into 'master'Rémy Coutable2018-09-041-0/+1
| |\
| | * Enable JUnit results for rspecKamil Trzciński2018-09-031-0/+1