summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Reduced sidebar wait timeoutboards-sidebar-spec-refactorPhil Hughes2017-02-171-1/+1
* Refactor boards sidebar specPhil Hughes2017-02-171-86/+53
* Merge branch 'dont-compress-development-assets' into 'master' Alfredo Sumaran2017-02-171-4/+4
|\
| * remove trailing commadont-compress-development-assetsMike Greiling2017-02-161-1/+1
| * replace deprecated NoErrorsPlugin with NoEmitOnErrorsPluginMike Greiling2017-02-161-1/+1
| * only compress assets in productionMike Greiling2017-02-161-4/+4
* | Merge branch '28248-use-page' into 'master' Robert Speicher2017-02-172-3/+23
|\ \
| * | Reduce number of pipelines created to test pagination28248-use-pageFilipa Lacerda2017-02-162-7/+6
| * | Merge branch 'master' into 28248-use-pageFilipa Lacerda2017-02-1623-214/+329
| |\ \
| * \ \ Merge branch 'master' into 28248-use-pageFilipa Lacerda2017-02-16110-1663/+2351
| |\ \ \
| * \ \ \ Merge branch 'master' into 28248-use-pageFilipa Lacerda2017-02-1545-117/+171
| |\ \ \ \
| * | | | | Use `page` query parameter instead of `p` to keep consistency with all URLsFilipa Lacerda2017-02-152-2/+24
* | | | | | Merge branch '28059-add-pagination-to-admin-abuse-reports' into 'master' Alfredo Sumaran2017-02-163-0/+24
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Restore pagination to admin abuse reportsEric Eastwood2017-02-163-0/+24
* | | | | | Merge branch 'fix-8.17-upgrade-process' into 'master' Alfredo Sumaran2017-02-163-15/+46
|\ \ \ \ \ \
| * | | | | | fix typo in node sectionfix-8.17-upgrade-processMike Greiling2017-02-161-1/+1
| * | | | | | move "Install node modules" step before "Migrate DB" within update processMike Greiling2017-02-161-1/+1
| * | | | | | update migration docs for 8.17 to include minimum node versionMike Greiling2017-02-163-15/+46
* | | | | | | Merge branch 'fix/project-tree-restorer-spec-performance' into 'master' Robert Speicher2017-02-162-95/+122
|\ \ \ \ \ \ \
| * | | | | | | refactored a couple of thingsfix/project-tree-restorer-spec-performanceJames Lopez2017-02-161-12/+9
| * | | | | | | create lighter version of JSON and reuse initial restore in spec to speed up runJames Lopez2017-02-152-91/+121
* | | | | | | | Merge branch 'add-issues-button-disable' into 'master' Fatih Acet2017-02-162-1/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Disables add issue buttonadd-issues-button-disablePhil Hughes2017-02-092-1/+7
* | | | | | | | Merge branch 'fix-pipelines-pagination-is-gone' into 'master' Alfredo Sumaran2017-02-162-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Renders pagination again for pipelines tableFilipa Lacerda2017-02-162-2/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'docs/pages-admin' into 'master' Achilleas Pipinellis2017-02-162-156/+248
|\ \ \ \ \ \ \ \
| * | | | | | | | Simplify Pages admin source docsdocs/pages-adminAchilleas Pipinellis2017-02-161-91/+160
| * | | | | | | | Simplify Pages admin Omnibus docsAchilleas Pipinellis2017-02-161-65/+88
* | | | | | | | | Merge branch 'active_when' into 'master' Robert Speicher2017-02-1617-55/+66
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add active_when helperSemyon Pupkov2017-02-1517-55/+66
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'seed-abuse-reports' into 'master' Stan Hu2017-02-162-0/+9
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Seed abuse reportsseed-abuse-reportsEric Eastwood2017-02-152-0/+9
| |/ / / / / / /
* | | | | | | | Merge branch '28262-horizontal-scrolling-issue-on-long-project-names' into 'm...Annabel Dunstone Gray2017-02-162-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Wrap long Project and Group titles28262-horizontal-scrolling-issue-on-long-project-namesSam Rose2017-02-162-0/+5
* | | | | | | | | Merge branch 'instrument-in-karma' into 'master' Alfredo Sumaran2017-02-163-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move babel config for instanbul to karma config (!9286)winniehell2017-02-163-1/+15
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch '28247-timeloops-bug' into 'master' Clement Ho2017-02-166-52/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix broken test28247-timeloops-bugFilipa Lacerda2017-02-161-2/+2
| * | | | | | | | | Transforms startTimeAgoLoops into a static method so we can reuse it instead ...Filipa Lacerda2017-02-163-9/+5
| * | | | | | | | | Only run timeago loops after rendering timeago componentsFilipa Lacerda2017-02-165-43/+34
* | | | | | | | | | Merge branch '28253-fix-buid-scroll-button-position' into 'master' Annabel Dunstone Gray2017-02-162-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add CHANGELOG fileAlfredo Sumaran2017-02-161-0/+4
| * | | | | | | | | | Fix positioning of top scroll buttonAlfredo Sumaran2017-02-161-1/+1
* | | | | | | | | | | Merge branch '27281-devicon' into 'master'Robert Speicher2017-02-164-1/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | dev favicon is blue, not purple27281-deviconSimon Knox2017-02-163-3/+3
| * | | | | | | | | | | override favicon for development to find tabs more easilySimon Knox2017-02-164-1/+17
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master' Douwe Maan2017-02-164-6/+31
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix a number of race conditions that can occur during namespace deletionsh-namespace-cleanup-deleted-projectsStan Hu2017-02-154-6/+31
* | | | | | | | | | | | Merge branch '26957-tanuki-anim-hang' into 'master' Clement Ho2017-02-166-6/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | don't trigger tanuki loader when downloading files26957-tanuki-anim-hangSimon Knox2017-02-166-6/+26
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |