summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix version for DB schema.21894-db-schema-rb-is-not-up-to-dateRuben Davila2016-09-081-1/+1
* Merge branch 'fix-random-failing-tests' into 'master' Stan Hu2016-09-081-1/+1
|\
| * Make sure DatabaseCleaner.clean runs AFTER Capybara's cleanupAirat Shigapov2016-09-041-1/+1
* | Merge branch 'feature/prune-old-events' into 'master' Yorick Peterse2016-09-074-0/+45
|\ \
| * | Optimized event pruning query to avoid two queries.Olaf Tomalka2016-09-072-4/+12
| * | Limited amount of pruned Event rows per runOlaf Tomalka2016-09-073-2/+3
| * | Added cron to prune events older than 12 months.Olaf Tomalka2016-09-074-0/+36
* | | Merge branch 'blame-ui-fix' into 'master' Annabel Dunstone Gray2016-09-074-21/+8
|\ \ \
| * | | Fix layout issues with blame tableblame-ui-fixPhil Hughes2016-09-064-21/+8
* | | | Merge branch '19183-refactor-sidebar-js' into 'master' Fatih Acet2016-09-0710-148/+104
|\ \ \ \
| * | | | sync sidebar DOM state on page:change to minimize split-second appearance of ...19183-refactor-sidebar-jsMike Greiling2016-09-071-3/+2
| * | | | remove dead code - 'collapsed_nav' cookie no longer used since a1fbdbb6 (see ...Mike Greiling2016-09-073-39/+1
| * | | | remove superfluous "collapsed" class and rename header classes for clarityMike Greiling2016-09-075-34/+8
| * | | | refactor sidebar logic into singleton classMike Greiling2016-09-075-83/+104
| | |/ / | |/| |
* | | | Merge branch 'update/rouge-2.0.6' into 'master' Stan Hu2016-09-072-1/+2
|\ \ \ \
| * | | | add a CHANGELOG notehttp://jneen.net/2016-09-071-0/+1
| * | | | update rouge to 2.0.6http://jneen.net/2016-09-071-1/+1
| |/ / /
* | | | Merge branch 'issue_21821' into 'master' Fatih Acet2016-09-073-11/+58
|\ \ \ \
| * | | | Fix project settings fieldissue_21821Felipe Artur2016-09-063-11/+58
* | | | | Merge branch 'fix-textarea-expansion' into 'master' Fatih Acet2016-09-074-13/+73
|\ \ \ \ \
| * | | | | Add textarea autoresize after commentClement Ho2016-09-014-13/+73
* | | | | | Merge branch 'fix-contributions-label-truncation' into 'master' Fatih Acet2016-09-072-1/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix contributions calendar month label truncationClement Ho2016-09-072-1/+16
* | | | | | Merge branch 'replace-animate-emoji-timeout' into 'master' Fatih Acet2016-09-074-49/+39
|\ \ \ \ \ \
| * | | | | | Replace animateEmoji timeout with eventListenerClement Ho2016-09-064-49/+39
* | | | | | | Merge branch 'refactor/ci-config-add-logical-validation' into 'master' Rémy Coutable2016-09-0720-187/+318
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into refactor/ci-config-add-logical-validationrefactor/ci-config-add-logical-validationGrzegorz Bizon2016-09-03432-3219/+7040
| |\ \ \ \ \ \ \
| * | | | | | | | Use double instead of spy in job config node specsGrzegorz Bizon2016-09-031-1/+1
| * | | | | | | | Add method that returns commands for ci job entryGrzegorz Bizon2016-08-295-31/+50
| * | | | | | | | Do not override job nodes in legacy ci config codeGrzegorz Bizon2016-08-291-5/+5
| * | | | | | | | Make it possible to inherit global ci config nodesGrzegorz Bizon2016-08-293-8/+80
| * | | | | | | | Add [] method for accessing ci entry dependenciesGrzegorz Bizon2016-08-252-0/+27
| * | | | | | | | Remove temporary stub method from ci config nodesGrzegorz Bizon2016-08-258-26/+24
| * | | | | | | | Expose compose method in the ci config entry nodesGrzegorz Bizon2016-08-256-44/+47
| * | | | | | | | Rename unspecified and undefined CI config nodesGrzegorz Bizon2016-08-259-98/+103
| * | | | | | | | Inject dependencies into each CI config entry nodeGrzegorz Bizon2016-08-255-8/+15
* | | | | | | | | Merge branch 'fix-allowed-conflict-size' into 'master' Rémy Coutable2016-09-073-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix merge conflict size limitfix-allowed-conflict-sizeSean McGivern2016-09-073-3/+4
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'search-helper-escape-regexp' into 'master' Rémy Coutable2016-09-073-1/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Escape search term before passing it to Regexp.new (!6241)winniehell2016-09-072-1/+4
| * | | | | | | | | Add failing test for #14360winniehell2016-09-071-0/+4
* | | | | | | | | | Merge branch 'zj-use-project-finder-pipelines-api' into 'master' Rémy Coutable2016-09-075-20/+78
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use PipelinesFinder in Pipelines APIZ.J. van de Weg2016-09-075-20/+78
* | | | | | | | | | | Merge branch 'shortcuts-modal-fix' into 'master' Fatih Acet2016-09-071-273/+274
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix styling of shortcuts modalPhil Hughes2016-09-071-273/+274
* | | | | | | | | | | | Merge branch 'issues-filters-reset-btn' into 'master' Fatih Acet2016-09-075-10/+114
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into issues-filters-reset-btnBryce Johnson2016-09-0712-13/+176
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Simulate filtering with url params, clean up accordingly.Bryce Johnson2016-09-071-44/+7
| * | | | | | | | | | | Add failing reset all test.Bryce Johnson2016-09-071-6/+11
| * | | | | | | | | | | Merge branch 'master' into issues-filters-reset-btnBryce Johnson2016-09-0734-165/+336
| |\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status