summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Removed z-index from flash containerflash-container-z-indexPhil Hughes2016-09-081-2/+0
* Merge branch 'enable-rspec-formatter' into 'master' Kamil Trzciński2016-09-081-1/+1
|\
| * Add color to rspec outputenable-rspec-formatterStan Hu2016-08-201-1/+1
| * Enable rspec documentation formatterStan Hu2016-08-201-1/+1
* | Merge branch '21109-discussion-resolve-runs-a-single-update-query-per-note-bu...Douwe Maan2016-09-086-71/+125
|\ \
| * | Optimize discussion notes resolving and unresolving21109-discussion-resolve-runs-a-single-update-query-per-note-but-should-run-a-single-update-query-for-all-notes-insteadAlejandro Rodríguez2016-09-066-71/+125
* | | Merge branch 'ref-update-multiple-commits' into 'master' Douwe Maan2016-09-082-16/+53
|\ \ \
| * | | Express intentions as expectationsJacob Vosmaer2016-09-071-5/+19
| * | | Rename {commit,update_branch}_with_hooksJacob Vosmaer2016-09-072-17/+17
| * | | Allow adding multiple commits in commit_with_hooksJacob Vosmaer2016-09-072-1/+24
* | | | Merge branch 'update-changelog-with-8-11-5' into 'master' Stan Hu2016-09-081-9/+8
|\ \ \ \
| * | | | Update CHANGELOG entries for 8.11.5.update-changelog-with-8-11-5Ruben Davila2016-09-071-9/+8
* | | | | Merge branch 'change-update-interval-of-runners' into 'master' Yorick Peterse2016-09-084-5/+8
|\ \ \ \ \
| * | | | | Change update interval of runners when trying to preserve contacted_atchange-update-interval-of-runnersKamil Trzcinski2016-09-074-5/+8
* | | | | | Merge branch '21772-expand-gl-method-names-in-importer-classes' into 'master' Rémy Coutable2016-09-086-10/+10
|\ \ \ \ \ \
| * | | | | | Rename `gl_user_id` to `gitlab_user_id` in importer classesAndrew Smith2016-09-086-10/+10
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'sh-update-db-schema' into 'master' Yorick Peterse2016-09-081-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix DB schema to match latest migrationsh-update-db-schemaStan Hu2016-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
View Lorry Controller Status