summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix MR diffs background migration when file modes are missing36630-activerecord-statementinvalid-pg-notnullviolation-error-null-value-in-column-a_mode-violates-not-null-constraintSean McGivern2017-08-182-1/+24
| | | | | | | | | | | Guess the modes based on the following: 1. If the file didn't exist, it's zero. 2. If the diff contains 'Subproject commit', it might be a submodule, so 0600. 3. Otherwise, it's 0644. This isn't perfect, but it doesn't have to be - it won't change file modes in the repository.
* Merge branch 'gitaly_ref_exists' into 'master'Sean McGivern2017-08-188-28/+106
|\ | | | | | | | | | | | | Client Implementation: RefService::RefExists Closes gitaly#452 See merge request !13528
| * Client Implementation: RefService::RefExistsgitaly_ref_existsAndrew Newdigate2017-08-188-28/+106
| |
* | Merge branch '36648-fix-backoff-util-tests' into 'master'Phil Hughes2017-08-182-29/+31
|\ \ | | | | | | | | | | | | | | | | | | Fix unnecessarily long gl.utils.backOff test Closes #36648 See merge request !13651
| * | fix unnecessarily long gl.utils.backOff test36648-fix-backoff-util-testsMike Greiling2017-08-182-29/+31
| | |
* | | Merge branch '32795-project-activity-i18n' into 'master'Phil Hughes2017-08-186-18/+170
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for i18n on Project Activity Page Closes #32795 See merge request !13451
| * | | Add support for i18n on Project Activity PageKushal Pandya2017-08-186-18/+170
|/ / /
* | | Merge branch 'mk-setup-settings-properly' into 'master'Douwe Maan2017-08-182-1/+34
|\ \ \ | | | | | | | | | | | | | | | | Setup settings properly See merge request !13645
| * | | Setup repositories settings properlymk-setup-settings-properlyMichael Kozono2017-08-172-1/+14
| | | |
| * | | Setup LDAP settings properlyMichael Kozono2017-08-172-0/+20
| | | |
* | | | Merge branch '36041-notification-title' into 'master'Douwe Maan2017-08-186-43/+62
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Don't escape html entities in InlineDiffMarkdownMarker Closes #36041 See merge request !13553
| * | | Don't escape html entities when rich == raw line36041-notification-titleJarka Kadlecova2017-08-176-43/+62
| | | |
* | | | Merge branch 'gitaly-apply-gitattributes' into 'master'Sean McGivern2017-08-184-27/+124
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly apply gitattributes Closes gitaly#464 See merge request !13517
| * | | | Incorporate RepositoryService.ApplyGitattributes Gitaly RPCgitaly-apply-gitattributesAlejandro Rodríguez2017-08-174-27/+61
| | | | |
| * | | | Add GitalyClient::RepositoryService specsAlejandro Rodríguez2017-08-171-0/+63
| | | | |
* | | | | Merge branch 'rename-repo-enabled' into 'master'Phil Hughes2017-08-182-10/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Updates for proper obj notation. See merge request !13430
| * | | | | use proper object notation and rename isNewRepo to isNewRepoEnabledrename-repo-enabledMike Greiling2017-08-172-10/+6
| | | | | |
* | | | | | Merge branch 'tc-git-tower-pagination-links' into 'master'Grzegorz Bizon2017-08-183-10/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: do not set rel="next" pagination header when no records found Closes #36618 See merge request !13629
| * | | | | | Total Pages should be at least onetc-git-tower-pagination-linksToon Claes2017-08-172-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And the link to the last page cannot be `page=0`.
| * | | | | | Add specs for pagination Link headerToon Claes2017-08-172-4/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs that check the 'Link' header for the inclusion of: - rel="first" - rel="last" - rel="prev" - rel="next" Fixes gitlab-org/gitlab-ce#36618 Related to gitlab-com/infrastructure#2532
| * | | | | | don't add next page link if current page is out of rangeJordan Patterson2017-08-171-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch '36611-error-in-getcomposer-link' into 'master'🏖 Rémy Coutable 🏖2017-08-182-1/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix external link to Composer website Closes #36611 See merge request !13621
| * | | | | Fix external link to Composer websiteMark Fletcher2017-08-172-1/+6
| | | | | |
* | | | | | Merge branch 'winh-admin-user-actions-dropdown' into 'master'Clement Ho2017-08-173-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make admin user actions dropdown consistent See merge request !13630
| * | | | | | Make admin user actions dropdown consistentwinh-admin-user-actions-dropdownwinh2017-08-173-1/+9
| |/ / / / /
* | | | | | Merge branch '36448-smiles-are-broken-in-9-5-0-rc2' into 'master'Clement Ho2017-08-171-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the blown up emoji problem in notes Closes #36448 and #36282 See merge request !13632
| * | | | | Fixes the blown up emoji problem in notesTim Zallmann2017-08-171-1/+2
|/ / / / /
* | | | | Merge branch 'docs/docker-entrypoint' into 'master'Marcia Ramos2017-08-171-17/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Properly explain when advanced Docker options were introduced See merge request !13608
| * | | | | Properly explain when advanced Docker options were introduceddocs/docker-entrypointAchilleas Pipinellis2017-08-161-17/+23
| | | | | |
* | | | | | Merge branch 'docs-article-undo-things-in-git' into 'master'Marcia Ramos2017-08-176-52/+551
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: article - "Numerous undo possibilities in Git" Closes gitlab-com/community-writers#40 See merge request !13513
| * | | | | Fix conflictdocs-article-undo-things-in-gitMarcia Ramos2017-08-17650-4524/+9990
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into 'docs-article-undo-things-in-git' # Conflicts: # doc/articles/index.md
* | | | | | Merge branch 'docs/importing-refactor' into 'master'Marcia Ramos2017-08-1731-518/+526
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move workflow/importing/ to user/project/import/ See merge request !13593
| * | | | | | Move workflow/importing/ to user/project/import/Achilleas Pipinellis2017-08-1731-518/+526
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'winh-collapsed-sidebar-scrolling' into 'master'Phil Hughes2017-08-171-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent horizontal scrolling in new sidebar when collapsed Closes #36608 and #36507 See merge request !13638
| * | | | | | Prevent horizontal scrolling in new sidebar when collapsedwinh2017-08-171-0/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '36087-users-cannot-delete-their-account' into 'master'Rémy Coutable2017-08-173-33/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow all users to delete their account Closes #36087 See merge request !13636
| * | | | | | Allow all users to delete their accountJacopo2017-08-173-33/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the user could not delete his own account unless signup was enabled in the global settings. This was due to the fact that deleting the user would also delete the issues and other items associated to him. Deleting an user does not destroy essential data anymore, for this reason we removed the `signup_enabled?` check.
* | | | | | | Merge branch 'ee-2628-backport-to-ce' into 'master'Douwe Maan2017-08-1712-67/+170
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports EE mirror stuck handling feature… See merge request !13627
| * | | | | | | Backports EE mirror stuck handling feature ↵ee-2628-backport-to-ceTiago Botelho2017-08-1712-67/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE
* | | | | | | | Merge branch 'grpc-1.4.5' into 'master'Douwe Maan2017-08-173-10/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use grpc 1.4.5 Closes gitaly#468 See merge request !13597
| * | | | | | | | Use grpc 1.4.5grpc-1.4.5Jacob Vosmaer2017-08-173-10/+23
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-height-of-group-share-dropdown' into 'master'Tim Zallmann2017-08-171-2/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed height of group share dropdown Closes gitlab-ee#3149 See merge request !13505
| * | | | | | | | Fixed height of group share dropdownPhil Hughes2017-08-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/3149
* | | | | | | | | Merge branch 'backstage/gb/migrations-tests-schema-version' into 'master'Sean McGivern2017-08-175-28/+47
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve migrations / background migrations testing strategy Closes #36303 See merge request !13589
| * | | | | | | | | Disable migrations output in migrations helpersGrzegorz Bizon2017-08-171-3/+17
| | | | | | | | | |
| * | | | | | | | | Migrate down before each migration unit testbackstage/gb/migrations-tests-schema-versionGrzegorz Bizon2017-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `migrate!` helper triggers a migration that is under the test, so we need to revert it before each subsequent example. This means that we need to place it in `before(:each, :migration)` hook. We still want to migrate everything up *after* each *context*, so in otherwords we need to place migrate up helper in `before(:context, :migration)`.
| * | | | | | | | | Disable db_cleaner tables caching in migrations testsGrzegorz Bizon2017-08-161-2/+2
| | | | | | | | | |
| * | | | | | | | | Extend migrations testing documentationGrzegorz Bizon2017-08-161-2/+8
| | | | | | | | | |
| * | | | | | | | | Make it possible to provide schema version in testsGrzegorz Bizon2017-08-163-24/+23
| | | | | | | | | |
| * | | | | | | | | Migrate db schema for context in :migration specsGrzegorz Bizon2017-08-162-3/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | |
View Lorry Controller Status