summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* update karma CI build image to Chrome 6036517-failing-karma-tests-for-chrome-60Mike Greiling2017-08-181-1/+1
* fix test failures in text_utility_spec.js on Chrome 60Mike Greiling2017-08-181-0/+1
* fix test failures in board_new_issue_spec.js on Chrome 60Mike Greiling2017-08-171-2/+6
* 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
| * | | | | | | | Frontend to send template name instead of on/offZeger-Jan van de Weg2017-08-173-3/+3
* | | | | | | | | Merge branch 'fixed-collapsed-sidebar-fly-out-not-showing' into 'master'Tim Zallmann2017-08-171-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed collapsed sidebar not showing fly-out menuPhil Hughes2017-08-171-2/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'zj-upgrade-grape' into 'master'Douwe Maan2017-08-178-21/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Upgrade grape to 1.0Zeger-Jan van de Weg2017-08-168-21/+23
* | | | | | | | | | Merge branch 'help-page-spec-fix' into 'master'Rémy Coutable2017-08-171-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix help page version image spechelp-page-spec-fixPhil Hughes2017-08-161-1/+1
* | | | | | | | | | | Merge branch 'fix-milestone-sidebar' into 'master'Phil Hughes2017-08-172-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix milestone sidebar collapse buttonfix-milestone-sidebarClement Ho2017-08-162-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bvl-docs-add-reserved-names-to-docs' into 'master'Achilleas Pipinellis2017-08-174-6/+122
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add reserved names to docsbvl-docs-add-reserved-names-to-docsBob Van Landuyt2017-08-164-6/+122
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-1612-104/+160
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Only create commit GPG signature when necessarydm-gpg-signature-performanceDouwe Maan2017-08-1612-104/+160
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '36450_second_touch_up' into 'master'Clement Ho2017-08-162-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | change to 'Not confidential'36450_second_touch_upRegis2017-08-162-2/+2
| | |_|_|/ / / / / | |/| | | | | | |