Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove sync script for gitlab-svgs and reference the vendored library directly | Mike Greiling | 2018-03-09 | 2 | -48/+6 |
| | |||||
* | Merge branch 'blackst0ne-add-rails5-method' into 'master' | Dmitriy Zaporozhets | 2018-03-09 | 1 | -0/+6 |
|\ | | | | | | | | | [Rails5] Add `Gitlab.rails5?` method See merge request gitlab-org/gitlab-ce!17660 | ||||
| * | Add Gitlab.rails5? methodblackst0ne-add-rails5-method | blackst0ne | 2018-03-09 | 1 | -0/+6 |
| | | |||||
* | | [CE] Add Naming/FileName rule checking expected class/module per filename | Gabriel Mazetto | 2018-03-08 | 4 | -10/+4 |
|/ | |||||
* | Service integration displays validation errors on test fail | James Edwards-Jones | 2018-03-07 | 1 | -1/+1 |
| | | | | | | | | Fixes attempts to update a service integration which had `can_test?` set to true but validations were causing the "Test and save changes" button to return "Something went wrong on our end." Removes references to index action left from 0af99433143727088b6a0a1b2163751c05d80ce6 | ||||
* | Merge branch 'replace_redcarpet_with_cmark' into 'master' | Sean McGivern | 2018-03-07 | 1 | -0/+1 |
|\ | | | | | | | | | Add CommonMark markdown engine See merge request gitlab-org/gitlab-ce!14835 | ||||
| * | Add CommonMark markdown enginereplace_redcarpet_with_cmark | blackst0ne | 2018-03-07 | 1 | -0/+1 |
| | | |||||
* | | Remove common_vue bundle | Mike Greiling | 2018-03-06 | 1 | -2/+0 |
| | | |||||
* | | Merge branch 'master' into 'issue_38337' | Felipe Artur | 2018-03-06 | 7 | -15/+24 |
|\ \ | | | | | | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb | ||||
| * \ | Merge branch 'proper-fix-for-artifacts-service' into 'master' | Grzegorz Bizon | 2018-03-06 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add archive feature to trace Closes #43022 and gitlab-ee#4170 See merge request gitlab-org/gitlab-ce!17314 | ||||
| | * | | Integrate two workers into one ArchiveTraceWorker with pipeline_background ↵ | Shinya Maeda | 2018-03-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | queue. This queue takes loqer precedence than pipeline_default. | ||||
| | * | | Add object_storage queue to sidekiq_queues.ym. and correct queue name in ↵ | Shinya Maeda | 2018-03-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | all_queues.yml. | ||||
| * | | | Merge branch '40187-project-branch-dashboard-with-active-stale-branches' ↵ | Rémy Coutable | 2018-03-06 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add overview of branches and filtered views for active/stale branches Closes #40187 et #17293 See merge request gitlab-org/gitlab-ce!15402 | ||||
| | * | | Add overview of branches and a filter for active/stale branches | Takuya Noguchi | 2018-03-06 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch '43670-improve-gitlab-kubernetes-cpu-metrics' into 'master' | Tim Zallmann | 2018-03-06 | 1 | -6/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitLab Kubernetes CPU metrics Closes #43670 and #43462 See merge request gitlab-org/gitlab-ce!17403 | ||||
| | * | | | Final updates for metrics | Joshua Lambert | 2018-02-28 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Fix k8s metrics | Joshua Lambert | 2018-02-27 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | Projects and groups badges API | Francisco Javier López | 2018-03-05 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Ports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4747 to CEbackport-ee-5049-to-ce | Tiago Botelho | 2018-03-05 | 1 | -2/+15 |
| | | | | | |||||
| * | | | | Merge branch 'remove-ide' into 'master' | Tim Zallmann | 2018-03-05 | 2 | -3/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove IDE from CE See merge request gitlab-org/gitlab-ce!17458 | ||||
| | * | | | | Remove IDE from CE | Phil Hughes | 2018-03-02 | 2 | -3/+0 |
| | | | | | | |||||
| * | | | | | Remove mr_notes webpack bundle | Mike Greiling | 2018-03-02 | 1 | -3/+0 |
| | | | | | | |||||
| * | | | | | Removed terminal webpack bundle tagterminal-bundle-refactor | Constance Okoghenun | 2018-03-02 | 1 | -1/+0 |
| | | | | | | |||||
* | | | | | | Fix a typo, a conflict and improve documentationissue_38337 | Felipe Artur | 2018-03-06 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Address review comments | Felipe Artur | 2018-03-05 | 2 | -9/+1 |
| | | | | | | |||||
* | | | | | | Bring one group board to CE | Felipe Artur | 2018-03-03 | 1 | -0/+11 |
|/ / / / / | |||||
* | | | | | Merge branch 'remove-test-bundle' into 'master' | Clement Ho | 2018-03-02 | 1 | -1/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove the "test" bundle and apply it conditionally within main.js See merge request gitlab-org/gitlab-ce!17472 | ||||
| * | | | | | remove the "test" bundle and apply it conditionally within main.jsremove-test-bundle | Mike Greiling | 2018-03-01 | 1 | -1/+0 |
| | | | | | | |||||
* | | | | | | Merge branch 'two_factor_auth_webpack_bundle_tag_refactor' into 'master' | Clement Ho | 2018-03-02 | 1 | -1/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes webpack bundle tag for two factor auth js See merge request gitlab-org/gitlab-ce!17330 | ||||
| * | | | | | | remove two_factor_auth bundletwo_factor_auth_webpack_bundle_tag_refactor | Mike Greiling | 2018-03-01 | 1 | -1/+0 |
| |/ / / / / | |||||
* | | | | | | Remove protected branches webpack bundle tag | Clement Ho | 2018-03-02 | 1 | -1/+0 |
| |/ / / / |/| | | | | |||||
* | | | | | Remove registry list webpack entry point | Clement Ho | 2018-03-01 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | Remove u2f webpack bundle | Mike Greiling | 2018-03-01 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch 'remove-blob-viewer-bundles' into 'master' | Phil Hughes | 2018-03-01 | 1 | -21/+0 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove blob viewer bundles See merge request gitlab-org/gitlab-ce!17446 | ||||
| * | | | | remove common_vue CommonsChunk config | Mike Greiling | 2018-03-01 | 1 | -14/+0 |
| | | | | | |||||
| * | | | | migrate stl_viewer to dynamic import | Mike Greiling | 2018-03-01 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | migrate sketch_viewer to dynamic import | Mike Greiling | 2018-03-01 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | migrate pdf_viewer to dynamic import | Mike Greiling | 2018-03-01 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | migrate notebook_viewer to dynamic import | Mike Greiling | 2018-03-01 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | migrate balsamiq_viewer to dynamic import | Mike Greiling | 2018-03-01 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master' | Douwe Maan | 2018-03-01 | 2 | -9/+9 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359 | ||||
| * | | | | Moved o_auth/saml/ldap modules under gitlab/auth | Horatiu Eugen Vlad | 2018-02-28 | 2 | -9/+9 |
| | | | | | |||||
* | | | | | Remove unnecessary chunks from common_vue | Clement Ho | 2018-03-01 | 1 | -11/+0 |
| | | | | | |||||
* | | | | | Merge branch 'dz-system-hooks-plugins' into 'master' | Douwe Maan | 2018-03-01 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to use external plugins as system hooks See merge request gitlab-org/gitlab-ce!17003 | ||||
| * | | | | | Add plugin queue to sidekiq config [ci skip] | Dmitriy Zaporozhets | 2018-02-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | Run plugins as separate process and pass data via STDIN | Dmitriy Zaporozhets | 2018-02-26 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | Remove plugin initializer and add plugins:validate rake task | Dmitriy Zaporozhets | 2018-02-26 | 1 | -29/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | Add external plugins support to extend system hooks | Dmitriy Zaporozhets | 2018-02-26 | 2 | -0/+30 |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Merge branch 'protected-tags-bundle-refactor' into 'master' | Clement Ho | 2018-03-01 | 1 | -1/+0 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Removed protected_tags webpack bundle See merge request gitlab-org/gitlab-ce!17334 | ||||
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵protected-tags-bundle-refactor | Constance Okoghenun | 2018-02-27 | 1 | -38/+50 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | protected-tags-bundle-refactor |