summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Document manual cleanup after background migration stealingdocument-background-migration-stealingSean McGivern2017-09-251-1/+28
|
* Merge branch 'sh-remove-additional-grit-settings' into 'master'Rémy Coutable2017-09-251-3/+1
|\ | | | | | | | | Remove Grit settings from default settings See merge request gitlab-org/gitlab-ce!14465
| * Remove Grit settings from default settingssh-remove-additional-grit-settingsStan Hu2017-09-231-3/+1
| | | | | | | | | | This is a follow-up to https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1956 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7308.
* | Merge branch 'master' into 'master'Rémy Coutable2017-09-251-2/+2
|\ \ | | | | | | | | | | | | fix minor spelling mistakes See merge request gitlab-org/gitlab-ce!14467
| * | fix minor spelling mistakesRené Genz2017-09-201-2/+2
| | |
* | | Update CHANGELOG.md for 10.0.1Stan Hu2017-09-232-5/+4
| |/ |/| | | [ci skip]
* | Merge branch 'sh-fix-issue-38246' into 'master'Yorick Peterse2017-09-233-2/+7
|\ \ | | | | | | | | | | | | | | | | | | Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration Closes #38246 See merge request gitlab-org/gitlab-ce!14460
| * | Fix duplicate key errors in PostDeployMigrateUserExternalMailData migrationsh-fix-issue-38246Stan Hu2017-09-223-2/+7
|/ / | | | | | | | | | | | | | | | | | | | | `email_provider` by default is NULL, and if a user had not logged the value would remain NULL. Upgrading to GitLab 10.0 would lead to a PG::UniqueViolation because the post-deploy migration would attempt to reinsert the entry because the NULL comparison between `users.email_provider` and `user_synced_attributes_metadata.email_provider` would never match. Closes #38246
* | Merge branch '38171-workaround' into 'master'Robert Speicher2017-09-221-1/+4
|\ \ | | | | | | | | | | | | | | | | | | Workaround for n+1 in Projects::TreeController#show Closes #38171 See merge request gitlab-org/gitlab-ce!14455
| * | Workaround for n+1 in Projects::TreeController#show38171-workaroundAndrew Newdigate2017-09-221-1/+4
| | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/38261
* | | Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master'Douwe Maan2017-09-2210-22/+175
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow the git circuit breaker to correctly handle missing repository storages Closes #36549 See merge request gitlab-org/gitlab-ce!14417
| * | | Allow the git circuit breaker to correctly handle missing repository storagesNick Thomas2017-09-2210-22/+175
| | | |
* | | | Merge branch 'docs-update-ux-guide' into 'master'Marcia Ramos2017-09-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fix typo in icons section See merge request gitlab-org/gitlab-ce!14444
| * | | | fix typo in icons sectiondocs-update-ux-guideSarrah Vesselov2017-09-221-1/+1
| | | | |
* | | | | Merge branch 'post_receive_n_plus_1_workaround' into 'master'Robert Speicher2017-09-221-2/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Workaround for #38259 See merge request gitlab-org/gitlab-ce!14453
| * | | | | Workaround for #38259Andrew Newdigate2017-09-221-2/+5
|/ / / / /
* | | | | Merge branch 'dm-group-share-lock-default-help' into 'master'Rémy Coutable2017-09-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inform user that current shared projects will remain shared Closes #38220 See merge request gitlab-org/gitlab-ce!14441
| * | | | | Inform user that current shared projects will remain shareddm-group-share-lock-default-helpDouwe Maan2017-09-221-1/+1
| | | | | |
* | | | | | Merge branch 'remove-redundant-icons' into 'master'Annabel Dunstone Gray2017-09-226-29/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed old icons from project page Closes #36567 See merge request gitlab-org/gitlab-ce!14185
| * | | | | | Removed old icons from project pagePhil Hughes2017-09-226-29/+3
|/ / / / / /
* | | | | | Merge branch 'ee-to-ce-2017-09-22' into 'master'Rémy Coutable2017-09-221-7/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show %board-add-issues-modal if there's no project See merge request gitlab-org/gitlab-ce!14442
| * | | | | | Don't show it if there's no project.ee-to-ce-2017-09-22Lin Jen-Shin2017-09-221-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is aligning with EE
* | | | | | | Merge branch 'winh-i18-branches-page' into 'master'Phil Hughes2017-09-224-66/+79
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make branches page translatable Closes #32797 See merge request gitlab-org/gitlab-ce!14221
| * | | | | | Make branches page translatableWinnie Hellmann2017-09-224-66/+79
|/ / / / / /
* | | | | | Merge branch 'jej/demonstrate-details-summary' into 'master'Achilleas Pipinellis2017-09-221-0/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Demonstrate <details> and <summary> tags in doc/user/markdown.md See merge request gitlab-org/gitlab-ce!14247
| * | | | | | Demonstrate <details> and <summary> tags in doc/user/markdown.mdjej/demonstrate-details-summaryJames Edwards-Jones2017-09-151-0/+24
| | | | | | |
* | | | | | | Merge branch 'feature/migrate-repository-diff' into 'master'Douwe Maan2017-09-225-16/+61
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#diff to Gitaly Closes gitaly#524 See merge request gitlab-org/gitlab-ce!14251
| * | | | | | | Migrate Gitlab::Git::Repository#diff to Gitalyfeature/migrate-repository-diffAhmad Sherif2017-09-215-16/+61
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Closes gitaly#524
* | | | | | | Merge branch 'ee-add-project-repository-storages-index' into 'master'Douwe Maan2017-09-223-1/+26
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Index projects on repository storage See merge request gitlab-org/gitlab-ce!14414
| * | | | | | Index projects on repository storageNick Thomas2017-09-213-1/+26
| | | | | | |
* | | | | | | Merge branch 'replace_project_shortcuts.feature' into 'master'Rémy Coutable2017-09-226-126/+119
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/shortcuts.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14431
| * | | | | | | Replace the 'project/shortcuts.feature' spinach test with an rspec analogreplace_project_shortcuts.featureVitaliy @blackst0ne Klachkov2017-09-226-126/+119
| | | | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cev10.1.0.preJarka Kadlecova2017-09-227-27/+116
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '38197-fix-ImapAuthenticationCheck' into 'master'Douwe Maan2017-09-222-17/+33
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `rake gitlab:incoming_email:check` Closes #38197 See merge request gitlab-org/gitlab-ce!14423
| | * | | | | | | | Fix rake gitlab:incoming_email:check and make it38197-fix-ImapAuthenticationCheckLin Jen-Shin2017-09-222-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | report error properly, so that we know what's really wrong.
| * | | | | | | | | Merge branch '38234-reserve-refs-replace' into 'master'Rémy Coutable2017-09-222-0/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reserve refs/replace because `git-replace` is using it Closes #38234 See merge request gitlab-org/gitlab-ce!14436
| | * | | | | | | | | Reserve refs/replace cos `git-replace` is using it38234-reserve-refs-replaceLin Jen-Shin2017-09-222-0/+6
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See: * https://www.kernel.org/pub/software/scm/git/docs/git-replace.html * https://git-scm.com/book/en/v2/Git-Tools-Replace
| * | | | | | | | | Merge branch '33328-usage-ping-for-gitlab-features-and-components' into 'master'Rémy Coutable2017-09-223-10/+77
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds gitlab features and components to usage ping data. Closes #33328 See merge request gitlab-org/gitlab-ce!14305
| | * | | | | | | | Adds gitlab features and components to usage ping data.33328-usage-ping-for-gitlab-features-and-componentsTiago Botelho2017-09-213-10/+77
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Update CHANGELOG.md for 10.0.0Jarka Kadlecova2017-09-22166-813/+180
|/ / / / / / / / | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'sh-blob-raw-check' into 'master'Douwe Maan2017-09-222-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that Blob.raw returns always returns a valid blob object See merge request gitlab-org/gitlab-ce!14412
| * | | | | | | | Ensure that Blob.raw returns always returns a valid blob objectsh-blob-raw-checkStan Hu2017-09-212-0/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In gitlab-org/gitlab-ee!2976, we saw that a given OID could point to a commit, which would cause the delta size check to fail. Gitaly already returns nil if the OID isn't a blob, so this change makes the Rugged implementation consistent.
* | | | | | | | Merge branch '32782-i18n-support-pagination' into 'master'Tim Zallmann2017-09-222-79/+100
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add i18n support to pagination widget See merge request gitlab-org/gitlab-ce!14407
| * | | | | | | | Add unextracted strings for i18n32782-i18n-support-paginationkushalpandya2017-09-211-75/+94
| | | | | | | | |
| * | | | | | | | Add i18n support for pagination testkushalpandya2017-09-211-4/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'emoji-dom-size' into 'master'Fatih Acet2017-09-222-6/+43
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve emoji menu rendering performance Closes #36949 See merge request gitlab-org/gitlab-ce!14233
| * | | | | | | | | Remove eslint-disable, and use arrow function.emoji-dom-sizeBryce Johnson2017-09-201-3/+2
| | | | | | | | | |
| * | | | | | | | | Reverse order in showMenuElement for readability.Bryce Johnson2017-09-201-2/+2
| | | | | | | | | |
| * | | | | | | | | Move display:none to emoji-menu base class.Bryce Johnson2017-09-201-4/+1
| | | | | | | | | |
| * | | | | | | | | Remove emoji-menu from the render tree when hidden.Bryce Johnson2017-09-192-6/+47
| | | | | | | | | |
View Lorry Controller Status