summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-fix-root-ref-repository' into 'master'40615-specific-10-2-fixRémy Coutable2017-12-013-0/+17
| | | | | | | | | | Gracefully handle case when repository's root ref does not exist Closes #40615 See merge request gitlab-org/gitlab-ce!15678 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Update VERSION to 10.2.3v10.2.3Michael Kozono2017-11-301-1/+1
|
* Update CHANGELOG.md for 10.2.3Michael Kozono2017-11-3011-51/+19
| | | [ci skip]
* Merge branch '10-2-stable-patch-3' into '10-2-stable'Winnie Hellmann2017-11-3080-281/+1549
|\ | | | | | | | | Prepare 10.2.3 release See merge request gitlab-org/gitlab-ce!15625
| * Merge branch 'gitaly-0.52.1' into '10-2-stable-patch-3'10-2-stable-patch-3Winnie Hellmann2017-11-291-1/+1
| |\ | | | | | | | | | | | | Use Gitaly 0.52.1 in 10-2-stable See merge request gitlab-org/gitlab-ce!15584
| | * Use Gitaly 0.52.1gitaly-0.52.1Jacob Vosmaer2017-11-231-1/+1
| | |
| * | Merge branch 'events-atom-feed-author-query' into 'master'Douwe Maan2017-11-292-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse authors when rendering event Atom feeds See merge request gitlab-org/gitlab-ce!15630 (cherry picked from commit a2fea9288ef0a2d714827ac5b92e7330d3cb2c3f) 63180167 Reuse authors when rendering event Atom feeds
| * | Merge branch 'backport-epic-tasklist' into 'master'Fatih Acet2017-11-296-42/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport epic tasklist See merge request gitlab-org/gitlab-ce!15556 (cherry picked from commit 59f93de0ba7c12575f95e4b7e6c313a09f98d52c) 6c2bc011 Backport epic tasklist dc92711b pick spec fixes from EE 0c0cb9e7 Fix spec
| * | Merge branch 'default-values-for-mr-states' into 'master'Sean McGivern2017-11-295-3/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix defaults for MR states and merge statuses Closes #40534 See merge request gitlab-org/gitlab-ce!15594 (cherry picked from commit 4976225209833899f632853ba7ab81b3c8ce239b) 4beacdb2 Fix defaults for MR states and merge statuses
| * | Fix text utility conflictsClement Ho2017-11-282-21/+12
| | |
| * | Fix merge_requests/base_service.rb conflictFelipe Artur2017-11-281-5/+0
| | |
| * | Merge branch 'optimise-stuck-ci-jobs-worker' into 'master'Yorick Peterse2017-11-285-14/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise StuckCiJobsWorker Closes gitlab-com/infrastructure#3260 See merge request gitlab-org/gitlab-ce!15527 (cherry picked from commit 420cdc6a5266df6de6767e3e3886e0019ae0ec6e) a26e25ea Optimise StuckCiJobsWorker d58bab4a Use not-ordered search 07c7ba1b Allow to drop jobs for deleted projects 6c1a4294 Fix stuck jobs tests
| * | Merge branch 'backport-disable-autocomplete' into 'master'Fatih Acet2017-11-284-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Backport disable autocomplete See merge request gitlab-org/gitlab-ce!15557 (cherry picked from commit 25a3a1838ab3224be0b6c658ea16fd1b37135372) fab9244c backport disable autocomplete
| * | Merge branch 'backport-epic-fullscreen' into 'master'Fatih Acet2017-11-283-68/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | Backport epic fullscreen See merge request gitlab-org/gitlab-ce!15437 (cherry picked from commit 04ceeac1f6c56f1c1f3faa9da6e8bc563b6c1393) 880c9a2c Backport fix epic fullscreen
| * | Merge branch '10-2-stable-patch-3' of ↵Tiago Botelho2017-11-2810-56/+69
| |\ \ | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into 10-2-stable-patch-3
| | * | Merge branch 'dm-project-search-performance' into 'master'Sean McGivern2017-11-286-44/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drastically improve project search performance by no longer searching namespace name Closes #40510 and #39623 See merge request gitlab-org/gitlab-ce!15590 (cherry picked from commit 7230a344537f653747b23ce467851e342e8de5e6) 8041a872 Drastically improve project search performance by no longer searching namespace name
| | * | Merge branch '40352-ignore-hashed-repos-cleanup-dirs' into 'master'Stan Hu2017-11-284-12/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ignore hashed repositories when doing rake gitlab:cleanup:dirs Closes #40352 See merge request gitlab-org/gitlab-ce!15600 (cherry picked from commit 815f35be4f84646cd723ae3beb0053bbe52ad136) 17069a95 ignore hashed repositories when doing rake gitlab:cleanup:dirs 9fddca65 added changelog 02dd3b4e static analysis fix 3bb103f2 refactored the hashed repository name 30a9fc33 static-analysis fix
| * | | Merge branch 'backport-add-epic-sidebar' into 'master'Fatih Acet2017-11-2817-9/+861
| |/ / | | | | | | | | | | | | | | | | | | Backport of add-epic-sidebar See merge request gitlab-org/gitlab-ce!15335 (cherry picked from commit f8de23e626f7a1d0b2f80f996a5f129323adc970)
| * | Merge branch 'issue_40374' into 'master'Sean McGivern2017-11-288-26/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix WIP system note not being created Closes #40374 See merge request gitlab-org/gitlab-ce!15528 (cherry picked from commit c4d844f08b99a5251f0d3cea7a493cb3480d5626)
| * | Merge branch 'dm-fix-registry-with-sudo-token' into 'master'Sean McGivern2017-11-283-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pulling and pushing using a personal access token with the sudo scope Closes #40466 See merge request gitlab-org/gitlab-ce!15571 (cherry picked from commit 89c9d2ad6b792885d234f153f2e13ee96639e4f8) 453b1780 Fix pulling and pushing using a personal access token with the sudo scope
| * | Merge branch 'fix/import-uploads-hashed-storage' into 'master'Nick Thomas2017-11-284-2/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix hashed storage for attachments bugs Closes #40280 See merge request gitlab-org/gitlab-ce!15482 (cherry picked from commit 1da5df70a99cb2f129ba56ae6eb3836dca56e136) d3c781f7 add upload saver spec 313bf9cd refactor spec 21357deb fix hashed storage and updated spec d3b0fbb3 add uploads restorer spec dce5909a fix typo ef08a96e add changelog 319dec77 refactor specs 30943bd9 fix spec be945c38 fix spec 0ed17fdc use dynamic_path_segment for path 22219e89 refactor spec
| * | Merge branch 'jk-group-mentions-fix' into 'master'Sean McGivern2017-11-2815-36/+51
|/ / | | | | | | | | | | | | | | | | | | | | Fix link text from group context Closes gitlab-ee#4100 See merge request gitlab-org/gitlab-ce!15565 (cherry picked from commit 038f5a412d0085f2d9610c77cea37cec75572b27) e826c5d0 Fix link text from group context
* | Update VERSION to 10.2.2v10.2.2Michael Kozono2017-11-231-1/+1
| |
* | Update CHANGELOG.md for 10.2.2Michael Kozono2017-11-2311-50/+22
|/ | | [ci skip]
* Merge branch '10-2-stable-patch-2' into '10-2-stable'Winnie Hellmann2017-11-2370-168/+683
|\ | | | | | | | | Prepare 10.2.2 release See merge request gitlab-org/gitlab-ce!15559
| * Merge branch 'winh-autodevops-codeclimate-10-2' into '10-2-stable-patch-2'10-2-stable-patch-2Fabio Busatto2017-11-231-2/+2
| |\ | | | | | | | | | | | | Lock codeclimate version to 0.69.0 (10.2 port) See merge request gitlab-org/gitlab-ce!15574
| | * Lock codeclimate version to 0.69.0Winnie Hellmann2017-11-231-2/+2
| | |
| * | Merge branch 'fix/sm/40478-gcp_clusters_migration_culprit' into 'master'Kamil Trzciński2017-11-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove cluster_id from 20171013104327_migrate_gcp_clusters_to_new_clusters_architectures See merge request gitlab-org/gitlab-ce!15566 (cherry picked from commit a6cafbcbe8d6802a81055c3469312f889cd73c9a) fd83bb03 Remove cluster_id from 20171013104327_migrate_gcp_clusters_to_new_clusters_architectures
| * | Merge branch '39653-hide-section_start-and-section_end-in-pipeline-emails' ↵Filipa Lacerda2017-11-231-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Hide `section_start` and `section_end` in pipeline emails" Closes #39653 See merge request gitlab-org/gitlab-ce!15534 (cherry picked from commit 3e558d8dbdbf39a0241b1e72ee494362624ace38) 4b4e83dc Add CSS hidden class in mailer layout
| * Revert "Merge branch 'grpc-update' into 'master'"Winnie Hellmann2017-11-231-2/+2
| | | | | | This reverts commit ac2c670de0fd28df354d75f959e6f03f540e53e0
| * Merge branch '40283-fix-missing-mr-widget-status-icons' into 'master'Tim Zallmann2017-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix missing MR widget status icons Closes #40283 See merge request gitlab-org/gitlab-ce!15533 (cherry picked from commit 6ebf6661afd1e4c4872f23f776b0b80d9e385528) 58e8c6b3 Fix missing MR widget status icons
| * Merge branch 'reduce-queries-for-artifacts-button' into 'master'Kamil Trzciński2017-11-233-1/+13
| | | | | | | | | | | | | | | | | | Use arrays in Ci::Pipeline#latest_builds_with_artifacts See merge request gitlab-org/gitlab-ce!15525 (cherry picked from commit ce019812a5127d503c735f5fe870e2aa4ad14665) 54f1e406 Use arrays in Pipeline#latest_builds_with_artifacts
| * Merge branch '40295-fix-reply-quote-shortcut-on-mr' into 'master'Clement Ho2017-11-234-1/+55
| | | | | | | | | | | | | | | | | | | | | | Fix reply quote keyboard shortcut on MRs Closes #40295 See merge request gitlab-org/gitlab-ce!15523 (cherry picked from commit 5083e0cf70b4c6cd0131b22bc670cac04626c161) 59502122 Fix reply quote keyboard shortcut on MRs
| * Merge branch '40377-blank-states' into 'master'Annabel Dunstone Gray2017-11-235-27/+46
| | | | | | | | | | | | | | | | | | | | | | Fix blank states using old css Closes #40377 See merge request gitlab-org/gitlab-ce!15521 (cherry picked from commit 4ebe69600fd7ae9da6fb419d76dd5267d9c3b8ca) 0ae8dc9d Fix blank states using old css
| * Merge branch 'fix-ci-pipelines-index' into 'master'Yorick Peterse2017-11-223-2/+42
| | | | | | | | | | | | Update composite pipelines index to include "id" See merge request gitlab-org/gitlab-ce!15519
| * Merge branch 'branch-exists-redis' into 'master'Rémy Coutable2017-11-232-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Redis cache for branch existence checks Closes #40349 See merge request gitlab-org/gitlab-ce!15513 (cherry picked from commit e2e4d18f1c468db8d76aaea1eb1d8442b196244b) 82e9bf29 Use Redis cache for branch existence checks 59fbefbd Add caching test 595631d2 refactor tests f3156232 apply Rémy's patch
| * Merge branch '40367-tagspage-tags' into 'master'Douwe Maan2017-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | Resolve "TagsPage|Tags" Closes #40367 See merge request gitlab-org/gitlab-ce!15512 (cherry picked from commit 9024875e1f81a3aab3c0879d33a4cea912ce833d) 3a70800f Use the correct i18n helper for namespaced string
| * Merge branch '1870-impersonation-stuck-on-password-change-ce' into 'master'Sean McGivern2017-11-234-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | [CE] Impersonation no longer gets stuck on password change. Closes #13888 See merge request gitlab-org/gitlab-ce!15497 (cherry picked from commit 340a5e70a24089d0cc1523d51e0bd9e070af06ab) 053a1988 Impersonation no longer gets stuck on password change. ef562690 Fix MR IID in changelog item
| * Merge branch '40292-bitbucket-import-hashed-storage' into 'master'Douwe Maan2017-11-233-5/+37
| | | | | | | | | | | | | | | | | | | | | | Fix bitbucket wiki import with hashed storage enabled Closes #40292 See merge request gitlab-org/gitlab-ce!15490 (cherry picked from commit c043ba67c2d6a9493518408fd198dea30ce6cfcb) f2977c63 Fix bitbucket wiki import with hashed storage enabled
| * Merge branch 'issue_40337' into 'master'Sean McGivern2017-11-233-9/+55
| | | | | | | | | | | | | | | | | | | | | | Fix promoting milestone updating all issuables without milestone Closes #40337 See merge request gitlab-org/gitlab-ce!15487 (cherry picked from commit 65545099554f97a30c66c2c8c36d24c589daddc3) 3f6e45ed Fix promoting milestone updating all issuables without milestone
| * Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'Douwe Maan2017-11-234-3/+38
| | | | | | | | | | | | | | | | | | | | | | Don't move project repository/attachments when using hashed storage Closes #40289 See merge request gitlab-org/gitlab-ce!15479 (cherry picked from commit bd026b6a28ac410ad455b7b915cafc9782296b6b) fa39e8a0 Don't move project repository/attachments when using hashed storage
| * Merge branch 'grpc-update' into 'master'Robert Speicher2017-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | Update gRPC to v1.7.2 Closes gitaly#742 See merge request gitlab-org/gitlab-ce!15439 (cherry picked from commit 9a8f094e34e9f6da5932f239a510abcd996a79b3) 473ae04d Update gRPC to v1.7.2
| * Merge branch 'backport-3434' into 'master'Filipa Lacerda2017-11-236-3/+72
| | | | | | | | | | | | | | | | | | | | | | | | Backport ability to enable/disable file attachments in issuable form See merge request gitlab-org/gitlab-ce!15433 (cherry picked from commit ea07773d81b82ca8d263e63b6ec245cfc2be282b) 24d6c935 Backport ability to enable/disable file attachments in issuable form 4f828bce Use mountComponent instead of nextTick 49adbe8c Code review changes cff048b6 Update toolbar_spec.js
| * Merge branch 'osw-merge-process-logs' into 'master'Sean McGivern2017-11-232-0/+17
| | | | | | | | | | | | | | | | | | | | Add logs for monitoring the merge process See merge request gitlab-org/gitlab-ce!15425 (cherry picked from commit 190ea021cd1fd89d20c9548a72034a7b941413ca) 011558ea Add logs for monitoring the merge process fad11dec Add MR reference to logs
| * Merge branch '39167-async-boards-sidebar' into 'master'Sean McGivern2017-11-2320-100/+174
| | | | | | | | | | | | | | | | | | | | | | | | Make Issue Boards sidebar subscriptions async Closes #39167 and #40094 See merge request gitlab-org/gitlab-ce!15364 (cherry picked from commit 7a61a8e09bcab5e0cb37ddb13900a5c07ef18918) d2699aea Add issue sidebar and toggle_subscription endpoint in board issues data f494dbc5 Async notification subscriptions in issue boards
| * Merge branch ↵Sean McGivern2017-11-236-3/+66
|/ | | | | | | | | | | | | | | | | | '39461-notes-api-for-issues-no-longer-returns-label-additions-removals' into 'master' Resolve "Notes API for issues no longer returns label additions/removals" Closes #39461 See merge request gitlab-org/gitlab-ce!15080 (cherry picked from commit f562e69eab0d7bac8ea20d29c3df981289dd8cdb) 4374a38f fix the commit reference pattern from matching other entities 160324d0 try to fix the failing spec on external refs 71b2cc1d reverting to the simpler approach 869fc05d fix the linting error 9ed91479 add the missing spec c900c21e add `#with_metadata` scope to remove a N+1 from the notes' API
* Update VERSION to 10.2.1v10.2.1Michael Kozono2017-11-221-1/+1
|
* Update CHANGELOG.md for 10.2.1Michael Kozono2017-11-222-5/+7
| | | [ci skip]
* Merge branch 'pawel/disable_prometheus_metrics' into 'master'10-2-stable-patch-1Stan Hu2017-11-222-3/+8
| | | | | | | | | Temporarily force disable prometheus metrics See merge request gitlab-org/gitlab-ce!15549 (cherry picked from commit 3193f13b444dc08366ebe2c223fb59ef2862f30b) bf77f1cd Force disable Prometheus metrics
* Merge branch 'qa/gb/fix-gitlab-qa-entrypoint-bad-merge' into '10-2-stable'Michael Kozono2017-11-221-1/+1
|\ | | | | | | | | Fix incorrect merge in GitLab QA entry page See merge request gitlab-org/gitlab-ce!15540