summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fixed up some weird line-number shrinking bugshort-codePhil Hughes2017-08-181-17/+11
* Add flex to everything to make the lines flow.Jacob Schatz2017-08-171-2/+22
* Add min height so lines take up all space.Jacob Schatz2017-08-171-3/+9
* Add styles for shorter codeJacob Schatz2017-08-171-0/+4
* 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
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'repo-fixes-flex-solution1' into 'master'Jacob Schatz2017-08-162-18/+32
|\ \ \ \ \ \
| * | | | | | Repo editor with flex layoutEric Eastwood2017-08-162-18/+32
|/ / / / / /
* | | | | | Merge branch 'commits-list-page-limit' into 'master'Tim Zallmann2017-08-162-1/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix commit list request appending 40 to offsetPhil Hughes2017-08-162-1/+6
* | | | | | Merge branch 'charlock-holmes-0.7.5' into 'master'Douwe Maan2017-08-162-3/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Use charlock_holmes 0.7.5Jacob Vosmaer2017-08-162-3/+3
* | | | | | Merge branch 'docs/database-development' into 'master'Rémy Coutable2017-08-167-1/+220
|\ \ \ \ \ \
| * | | | | | Document not using database hash indexesYorick Peterse2017-08-162-0/+21
| * | | | | | Document how to handle different DB (versions)Yorick Peterse2017-08-162-0/+27
| * | | | | | State that comma separated data is serialised dataYorick Peterse2017-08-161-1/+2
| * | | | | | Add more database development related docsYorick Peterse2017-08-164-0/+170
* | | | | | | Merge branch 'icon-sidebar-expanded-margin' into 'master'Clement Ho2017-08-161-2/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fixes icon sidebar expanding causing a jump in paddingicon-sidebar-expanded-marginPhil Hughes2017-08-151-2/+4
| | |_|/ / / | |/| | | |