summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* some more improvements to the diff notes coderesolve-btn-precompilePhil Hughes2017-08-1810-83/+97
* replaces the element with the vue element within an idlecallbackPhil Hughes2017-08-181-23/+42
* Merge branch 'master' into resolve-btn-precompilePhil Hughes2017-08-18765-5260/+11941
|\
| * Merge branch 'gitaly-apply-gitattributes' into 'master'Sean McGivern2017-08-184-27/+124
| |\
| | * 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
| |\ \
| | * | 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
| |\ \ \
| | * | | Total Pages should be at least onetc-git-tower-pagination-linksToon Claes2017-08-172-7/+13
| | * | | Add specs for pagination Link headerToon Claes2017-08-172-4/+52
| | * | | 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 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 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 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 introduceddocs/docker-entrypointAchilleas Pipinellis2017-08-161-17/+23
| * | | | | Merge branch 'docs-article-undo-things-in-git' into 'master'Marcia Ramos2017-08-176-52/+551
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix conflictdocs-article-undo-things-in-gitMarcia Ramos2017-08-17650-4524/+9990
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'docs/importing-refactor' into 'master'Marcia Ramos2017-08-1731-518/+526
| |\ \ \ \ \
| | * | | | | 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 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 accountJacopo2017-08-173-33/+24
| * | | | | | Merge branch 'ee-2628-backport-to-ce' into 'master'Douwe Maan2017-08-1712-67/+170
| |\ \ \ \ \ \
| | * | | | | | Backports EE mirror stuck handling feature (https://gitlab.com/gitlab-org/git...ee-2628-backport-to-ceTiago Botelho2017-08-1712-67/+170
| * | | | | | | Merge branch 'grpc-1.4.5' into 'master'Douwe Maan2017-08-173-10/+23
| |\ \ \ \ \ \ \
| | * | | | | | | 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 dropdownPhil Hughes2017-08-171-2/+1
| * | | | | | | | Merge branch 'backstage/gb/migrations-tests-schema-version' into 'master'Sean McGivern2017-08-175-28/+47
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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
| | * | | | | | | | 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
| * | | | | | | | | Merge branch '35072-fix-pages-delete' into 'master'Sean McGivern2017-08-174-5/+47
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Run remove_pages in a run_after_commit blockNick Thomas2017-08-173-1/+21
| | * | | | | | | | | Remove a wat in NamespacelessProjectDestroyWorkerNick Thomas2017-08-173-4/+26
| * | | | | | | | | | Merge branch 'issue_35580' into 'master'Rémy Coutable2017-08-174-24/+139
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix project import to group when there are project milestonesFelipe Artur2017-08-174-24/+139
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'dev.non-referable-inspect' into 'master'Sean McGivern2017-08-172-9/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | expose Referable#non_referable_inspectdev.non-referable-inspecthttp://jneen.net/2017-08-162-9/+5
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'zj-fix-fe-posting-value' into 'master'Kamil Trzciński2017-08-174-3/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Document project templates and link to itZeger-Jan van de Weg2017-08-173-2/+9
View Lorry Controller Status