summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Route path lookups through legacy_disk_pathmark-legacy-git-accessJacob Vosmaer2018-03-212-10/+5
|
* Remove sync script for gitlab-svgs and reference the vendored library directlyMike Greiling2018-03-092-48/+6
|
* Merge branch 'blackst0ne-add-rails5-method' into 'master'Dmitriy Zaporozhets2018-03-091-0/+6
|\ | | | | | | | | [Rails5] Add `Gitlab.rails5?` method See merge request gitlab-org/gitlab-ce!17660
| * Add Gitlab.rails5? methodblackst0ne-add-rails5-methodblackst0ne2018-03-091-0/+6
| |
* | [CE] Add Naming/FileName rule checking expected class/module per filenameGabriel Mazetto2018-03-084-10/+4
|/
* Service integration displays validation errors on test failJames Edwards-Jones2018-03-071-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 McGivern2018-03-071-0/+1
|\ | | | | | | | | Add CommonMark markdown engine See merge request gitlab-org/gitlab-ce!14835
| * Add CommonMark markdown enginereplace_redcarpet_with_cmarkblackst0ne2018-03-071-0/+1
| |
* | Remove common_vue bundleMike Greiling2018-03-061-2/+0
| |
* | Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-067-15/+24
|\ \ | | | | | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb
| * \ Merge branch 'proper-fix-for-artifacts-service' into 'master'Grzegorz Bizon2018-03-061-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 Maeda2018-03-061-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 Maeda2018-03-061-0/+1
| | | | | | | | | | | | | | | | all_queues.yml.
| * | | Merge branch '40187-project-branch-dashboard-with-active-stale-branches' ↵Rémy Coutable2018-03-061-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 branchesTakuya Noguchi2018-03-061-0/+1
| | | |
| * | | Merge branch '43670-improve-gitlab-kubernetes-cpu-metrics' into 'master'Tim Zallmann2018-03-061-6/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitLab Kubernetes CPU metrics Closes #43670 and #43462 See merge request gitlab-org/gitlab-ce!17403
| | * | | Final updates for metricsJoshua Lambert2018-02-281-3/+3
| | | | |
| | * | | Fix k8s metricsJoshua Lambert2018-02-271-5/+5
| | | | |
| * | | | Projects and groups badges APIFrancisco Javier López2018-03-051-0/+1
| | | | |
| * | | | Ports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4747 to CEbackport-ee-5049-to-ceTiago Botelho2018-03-051-2/+15
| | | | |
| * | | | Merge branch 'remove-ide' into 'master'Tim Zallmann2018-03-052-3/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove IDE from CE See merge request gitlab-org/gitlab-ce!17458
| | * | | | Remove IDE from CEPhil Hughes2018-03-022-3/+0
| | | | | |
| * | | | | Remove mr_notes webpack bundleMike Greiling2018-03-021-3/+0
| | | | | |
| * | | | | Removed terminal webpack bundle tagterminal-bundle-refactorConstance Okoghenun2018-03-021-1/+0
| | | | | |
* | | | | | Fix a typo, a conflict and improve documentationissue_38337Felipe Artur2018-03-061-0/+1
| | | | | |
* | | | | | Address review commentsFelipe Artur2018-03-052-9/+1
| | | | | |
* | | | | | Bring one group board to CEFelipe Artur2018-03-031-0/+11
|/ / / / /
* | | | | Merge branch 'remove-test-bundle' into 'master'Clement Ho2018-03-021-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-bundleMike Greiling2018-03-011-1/+0
| | | | | |
* | | | | | Merge branch 'two_factor_auth_webpack_bundle_tag_refactor' into 'master'Clement Ho2018-03-021-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_refactorMike Greiling2018-03-011-1/+0
| |/ / / / /
* | | | | | Remove protected branches webpack bundle tagClement Ho2018-03-021-1/+0
| |/ / / / |/| | | |
* | | | | Remove registry list webpack entry pointClement Ho2018-03-011-1/+0
|/ / / /
* | | | Remove u2f webpack bundleMike Greiling2018-03-011-1/+0
| | | |
* | | | Merge branch 'remove-blob-viewer-bundles' into 'master'Phil Hughes2018-03-011-21/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove blob viewer bundles See merge request gitlab-org/gitlab-ce!17446
| * | | | remove common_vue CommonsChunk configMike Greiling2018-03-011-14/+0
| | | | |
| * | | | migrate stl_viewer to dynamic importMike Greiling2018-03-011-1/+0
| | | | |
| * | | | migrate sketch_viewer to dynamic importMike Greiling2018-03-011-1/+0
| | | | |
| * | | | migrate pdf_viewer to dynamic importMike Greiling2018-03-011-2/+0
| | | | |
| * | | | migrate notebook_viewer to dynamic importMike Greiling2018-03-011-2/+0
| | | | |
| * | | | migrate balsamiq_viewer to dynamic importMike Greiling2018-03-011-1/+0
| | | | |
* | | | | Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'Douwe Maan2018-03-012-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/authHoratiu Eugen Vlad2018-02-282-9/+9
| | | | |
* | | | | Remove unnecessary chunks from common_vueClement Ho2018-03-011-11/+0
| | | | |
* | | | | Merge branch 'dz-system-hooks-plugins' into 'master'Douwe Maan2018-03-011-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 Zaporozhets2018-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Run plugins as separate process and pass data via STDINDmitriy Zaporozhets2018-02-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Remove plugin initializer and add plugins:validate rake taskDmitriy Zaporozhets2018-02-261-29/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add external plugins support to extend system hooksDmitriy Zaporozhets2018-02-262-0/+30
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'protected-tags-bundle-refactor' into 'master'Clement Ho2018-03-011-1/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Removed protected_tags webpack bundle See merge request gitlab-org/gitlab-ce!17334