summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-ce' into artifact-format-v2Shinya Maeda2018-07-202-87/+6
|\
| * Migrate add_remote, remove_remote, fetch_internal_remote to gitalyAlejandro Rodríguez2018-07-192-87/+6
* | Make GENERAL_ARCHIVE_FILE_TYPE as a single entryShinya Maeda2018-07-201-2/+2
* | Implement config artifact presenterShinya Maeda2018-07-203-2/+60
* | Introduce ARCHIVE_LEGACY_TRACES_MIGRATION_VERSION checkShinya Maeda2018-07-202-7/+25
* | Merge branch 'master-ce' into artifact-format-v2Shinya Maeda2018-07-2010-93/+113
|\ \ | |/
| * Backport of gitlab-org/gitlab-ee!6137Valery Sizov2018-07-191-3/+18
| * Add missing Gitaly branch_update nil checksJacob Vosmaer (GitLab)2018-07-192-5/+8
| * Merge branch 'add-total-time-flat-printer-for-profiling' into 'master'Rémy Coutable2018-07-192-0/+45
| |\
| | * Add a Gitlab::Profiler.print_by_total_time convenience methodSean McGivern2018-07-192-0/+45
| * | Merge branch 'sh-normalize-urls' into 'master'Grzegorz Bizon2018-07-191-6/+9
| |\ \ | | |/ | |/|
| | * Escape username and password in UrlSanitizer#full_urlStan Hu2018-07-191-6/+9
| * | Merge branch 'use-rugged-for-reference-validator' into 'master'Douwe Maan2018-07-191-4/+4
| |\ \
| | * | Use rugged to validate ref nameAhmad Hassan2018-07-191-4/+4
| * | | Merge branch '43312-remove_user_activity_workers' into 'master'Rémy Coutable2018-07-191-34/+0
| |\ \ \
| | * | | Delete UserActivities and related workers43312-remove_user_activity_workersImre Farkas2018-07-181-34/+0
| * | | | Incorporate Gitaly's RefService.FindAllRemoteBranches RPCgitaly-remote-branchesAlejandro Rodríguez2018-07-182-41/+29
| | |_|/ | |/| |
* | | | Use array_of_strings_or_string in CommandShinya Maeda2018-07-191-12/+1
* | | | Fix specShinya Maeda2018-07-191-1/+1
* | | | Fix specShinya Maeda2018-07-192-3/+3
* | | | Merge branch 'master-ce' into artifact-format-v2Shinya Maeda2018-07-198-205/+73
|\ \ \ \ | |/ / /
| * | | Fix serialization of LegacyDiffNoteJan Provaznik2018-07-181-1/+1
| * | | Fix filename for accelerated uploadsJan Provaznik2018-07-181-1/+11
| * | | Client implementation for Repository#new_commitsZeger-Jan van de Weg2018-07-183-50/+34
| |/ /
| * | Merge branch '27456-improve-feedback-when-dev-cannot-push-to-empty-repo' into...Douwe Maan2018-07-181-1/+24
| |\ \
| | * | Improves remote message when a developer is unable to push in an empty reposi...27456-improve-feedback-when-dev-cannot-push-to-empty-repoTiago Botelho2018-07-181-1/+24
| * | | Remove unreachable Git codeJacob Vosmaer (GitLab)2018-07-183-152/+3
* | | | Merge branch 'master' into artifact-format-v2Shinya Maeda2018-07-1827-343/+380
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jivl-dev-master-...jivl-dev-master-into-com-masterJose2018-07-171-1/+2
| |\ \ \
| | * \ \ Merge branch 'fix-issue-49133' into 'master'José Iván Vargas López2018-07-171-1/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Rename WHITELISTED_FILENAMES => IGNORED_FILENAMESStan Hu2018-07-171-2/+2
| | | * | Fix symlink vulnerability in project importStan Hu2018-07-171-1/+2
| * | | | Merge branch 'extract-ee-specific-banzai-filters' into 'master'Robert Speicher2018-07-173-10/+28
| |\ \ \ \
| | * | | | Extract EE-specific lines from Banzai pipelinesextract-ee-specific-banzai-filtersSean McGivern2018-07-133-10/+28
| * | | | | Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into 'mas...Douwe Maan2018-07-178-39/+131
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Keep #absolute_image_urls as a private instance methodSean McGivern2018-07-171-7/+3
| | * | | | Don't include a double slash when rewriting the URLSean McGivern2018-07-061-1/+4
| | * | | | Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_urlSean McGivern2018-07-0689-1435/+1293
| | |\ \ \ \
| | * | | | | Add documentation and specs for webhook URL rewritingSean McGivern2018-07-064-32/+50
| | * | | | | Add base class for hook builders, and use it for notes and wikisSean McGivern2018-06-207-31/+93
| | * | | | | Fix MR hook builderSean McGivern2018-06-201-1/+1
| | * | | | | Removing the empty line at the class body beginningSatish Perala2018-06-201-1/+0
| | * | | | | Checking for the presense of markdown textSatish Perala2018-06-201-1/+5
| | * | | | | Passing absolute image urls in the markdown content in the webhooksSatish Perala2018-06-203-0/+10
| * | | | | | Migrate merge base, merged branches, write refJacob Vosmaer (GitLab)2018-07-171-69/+6
| * | | | | | Merge branch 'feature/gb/email-delivery-metrics' into 'master'Sean McGivern2018-07-177-24/+74
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Implement action mailer delivery metrics observerGrzegorz Bizon2018-07-161-0/+31
| | * | | | | Move existing email interceptors into the same moduleGrzegorz Bizon2018-07-166-24/+43
| * | | | | | Merge branch 'fix-project-api-archived' into 'master'Rémy Coutable2018-07-162-2/+8
| |\ \ \ \ \ \
| | * | | | | | Fix archived parameter for projects APIMarko, Peter2018-07-162-2/+8