summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Restore comments lost when converting CoffeeScript to JavaScriptJared Deckard2016-09-0875-62/+760
* Merge branch 'pipeline-hooks' into 'master' Rémy Coutable2016-09-083-26/+129
|\
| * Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-09-06212-1693/+2262
| |\
| * | Not sure why there's an extra one!?Lin Jen-Shin2016-08-291-7/+0
| * | Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-08-2651-363/+379
| |\ \
| * | | Fix captionLin Jen-Shin2016-08-241-1/+1
| * | | Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-08-24471-2473/+9946
| |\ \ \
| * \ \ \ Merge branch 'master' into pipeline-hooksLin Jen-Shin2016-08-0260-323/+635
| |\ \ \ \
| * | | | | Slack pipeline events test and fix some issues along the wayLin Jen-Shin2016-08-012-12/+18
| * | | | | Reduce complexity by extracting it to a methodLin Jen-Shin2016-07-301-17/+20
| * | | | | Add pipeline_events to Slack service:Lin Jen-Shin2016-07-304-10/+106
| * | | | | Fix that tricky side-effect issue in the testLin Jen-Shin2016-07-291-1/+1
| * | | | | It was never usedLin Jen-Shin2016-07-291-2/+2
| * | | | | Don't execute hooks if ci was supposed to be skippedLin Jen-Shin2016-07-291-2/+3
| * | | | | Also touch the pipeline so we could just hook into update_stateLin Jen-Shin2016-07-292-6/+8
| * | | | | We're not using original hash anyway, we could use itLin Jen-Shin2016-07-291-1/+1
| * | | | | Add views for pipeline eventsLin Jen-Shin2016-07-292-1/+8
| * | | | | WIP, initial work to implement pipeline hooks:Lin Jen-Shin2016-07-295-0/+10
* | | | | | Merge branch 'dz-bulk-edit-mr' into 'master' Rémy Coutable2016-09-0816-80/+97
|\ \ \ \ \ \
| * | | | | | Refactor code for bulk update merge requests featuredz-bulk-edit-mrDmitriy Zaporozhets2016-09-084-12/+4
| * | | | | | Fix issues bulk update from issues index pageDmitriy Zaporozhets2016-09-082-2/+2
| * | | | | | Fix issuable_bulk_update_path and merge request spinach testDmitriy Zaporozhets2016-09-081-3/+3
| * | | | | | Make merge requests bulk update workingDmitriy Zaporozhets2016-09-082-1/+9
| * | | | | | Add bulk update support for merge requests listDmitriy Zaporozhets2016-09-0815-78/+95
* | | | | | | Merge branch 'awards-control-margin' into 'master' Annabel Dunstone Gray2016-09-084-7/+8
|\ \ \ \ \ \ \
| * | | | | | | fix padding top/bottomawards-control-margintauriedavis2016-09-071-1/+1
| * | | | | | | minor refactortauriedavis2016-09-071-5/+2
| * | | | | | | fix margin for multi-line emojistauriedavis2016-09-073-1/+7
| * | | | | | | fix margin for awards-control buttonstauriedavis2016-09-062-3/+1
* | | | | | | | Merge branch 'dz-mr-version-compare' into 'master' Douwe Maan2016-09-086-26/+94
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor compared_diff_version method in merge requests controllerdz-mr-version-compareDmitriy Zaporozhets2016-09-071-6/+2
| * | | | | | | | Refactor merge request version compare featureDmitriy Zaporozhets2016-09-073-9/+11
| * | | | | | | | Improve merge request version featureDmitriy Zaporozhets2016-09-075-36/+37
| * | | | | | | | Expand abbreviations in merge request version path helperDmitriy Zaporozhets2016-09-072-4/+4
| * | | | | | | | Refactor code for merge request version compare featureDmitriy Zaporozhets2016-09-072-47/+60
| * | | | | | | | Improve merge request version switch/compare dropdownDmitriy Zaporozhets2016-09-073-35/+44
| * | | | | | | | Compare merge request version against other version on changes pageDmitriy Zaporozhets2016-09-073-13/+34
| * | | | | | | | Add link to compare merge request versionsDmitriy Zaporozhets2016-09-072-0/+26
* | | | | | | | | Merge branch '21109-discussion-resolve-runs-a-single-update-query-per-note-bu...Douwe Maan2016-09-082-12/+45
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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-062-12/+45
* | | | | | | | | | Merge branch 'ref-update-multiple-commits' into 'master' Douwe Maan2016-09-081-10/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename {commit,update_branch}_with_hooksJacob Vosmaer2016-09-071-9/+9
| * | | | | | | | | | Allow adding multiple commits in commit_with_hooksJacob Vosmaer2016-09-071-1/+5
* | | | | | | | | | | Merge branch 'change-update-interval-of-runners' into 'master' Yorick Peterse2016-09-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Change update interval of runners when trying to preserve contacted_atchange-update-interval-of-runnersKamil Trzcinski2016-09-071-1/+1
* | | | | | | | | | | Merge branch 'feature/prune-old-events' into 'master' Yorick Peterse2016-09-071-0/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Optimized event pruning query to avoid two queries.Olaf Tomalka2016-09-071-2/+11
| * | | | | | | | | | | Limited amount of pruned Event rows per runOlaf Tomalka2016-09-071-1/+1
| * | | | | | | | | | | Added cron to prune events older than 12 months.Olaf Tomalka2016-09-071-0/+8
* | | | | | | | | | | | Merge branch 'blame-ui-fix' into 'master' Annabel Dunstone Gray2016-09-073-21/+7
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status