summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix MR conflict resolution commitsSean McGivern2016-08-121-1/+1
* Auto-highlight conflict when rich_text is calledSean McGivern2016-08-124-18/+28
* Fix commit tab initial loadSean McGivern2016-08-121-1/+5
* Fix merge conflict reading for new diffsSean McGivern2016-08-122-3/+3
* Fixes for merge conflicts UI.Fatih Acet2016-08-123-5/+6
* Allow resolving conflicts in MR controllerSean McGivern2016-08-126-8/+171
* Handle multiple merge conflict files in collectionSean McGivern2016-08-128-53/+172
* Add backend for merge conflicts readingSean McGivern2016-08-1210-22/+469
* Implement conflict selection with highlighting.Fatih Acet2016-08-123-13/+63
* Styling for selected/unselected versions.Fatih Acet2016-08-121-6/+38
* Remove icon and get conflicts count from data.Fatih Acet2016-08-121-9/+5
* Implemented conflict side selection.Fatih Acet2016-08-122-21/+65
* Update dummy data.Fatih Acet2016-08-121-1/+311
* Improvements to simplify vue template.Fatih Acet2016-08-122-31/+31
* Added new UI components for Merge Conflicts UI.Fatih Acet2016-08-124-0/+259
* Make resolve these conflicts text a link to conflicts tab.Fatih Acet2016-08-121-1/+4
* Added new Conflicts tab and conflicts placeholder to MRs page.Fatih Acet2016-08-121-0/+7
* Added dummy merge conflicts data.Fatih Acet2016-08-121-0/+95
* Added routes for conflicts in merge requests page.Fatih Acet2016-08-123-2/+11
* Added vue.js as a lib.Fatih Acet2016-08-121-0/+10073
* Merge branch 'fix-namespace-deletion' into 'master' Robert Speicher2016-08-1216-34/+179
|\
| * Fix bug where destroying a namespace would not always destroy projectsStan Hu2016-08-1116-34/+179
* | Merge branch 'ruby-2-3-1' into 'master' Douwe Maan2016-08-121-2/+2
|\ \
| * | Update ruby 2.3.1ruby-2-3-1Z.J. van de Weg2016-08-121-2/+2
* | | Merge branch '20059-environment-list' into 'master' Jacob Schatz2016-08-128-14/+52
|\ \ \
| * | | Add gravatars to build history20059-environment-listAnnabel Dunstone2016-08-083-3/+4
| * | | Add deployment ID and gravatar to environments pageAnnabel Dunstone2016-08-083-4/+8
| * | | Format environment history pageAnnabel Dunstone2016-08-081-2/+2
| * | | Add avatar to commit message; environment style updates to match pipelines pageAnnabel Dunstone2016-08-085-9/+25
| * | | Style deploy buttonAnnabel Dunstone2016-08-082-3/+20
* | | | Merge branch 'instrument-project-visible-to-user' into 'master' Rémy Coutable2016-08-122-0/+4
|\ \ \ \
| * | | | Instrument Project.visible_to_userYorick Peterse2016-08-122-0/+4
| | |/ / | |/| |
* | | | Merge branch 'improve-pipeline-processing' into 'master' Rémy Coutable2016-08-1212-113/+214
|\ \ \ \ | |/ / / |/| | |
| * | | Fix build play failureimprove-pipeline-processingKamil Trzcinski2016-08-121-1/+1
| * | | Improve transition between states for event `enqueue`Kamil Trzcinski2016-08-121-1/+1
| * | | Use event `enqueue` instead of `queue`Kamil Trzcinski2016-08-126-23/+34
| * | | Fix test failuresKamil Trzcinski2016-08-122-2/+2
| * | | Added specs for started_at and finished_atKamil Trzcinski2016-08-122-15/+46
| * | | Use explicit events to transition between statesKamil Trzcinski2016-08-122-13/+33
| * | | Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-123-4/+30
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-1231-208/+362
| |\ \ \
| * | | | Fix test failures, that did occur because of missing previously used `reload_...Kamil Trzcinski2016-08-117-56/+60
| * | | | Use state machine for pipeline event processingKamil Trzcinski2016-08-119-71/+54
| * | | | Verify the pipeline status after executing events on buildsKamil Trzcinski2016-08-113-1/+53
* | | | | Merge branch 'update-performance-guide' into 'master' Achilleas Pipinellis2016-08-121-5/+4
|\ \ \ \ \
| * | | | | Corrected links/usernames in performance guideupdate-performance-guideYorick Peterse2016-08-111-5/+4
* | | | | | Merge branch 'remove-unused-spam-report' into 'master' Robert Speicher2016-08-111-5/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove unused SpamReport model; this was renamed to SpamLogremove-unused-spam-reportStan Hu2016-08-111-5/+0
* | | | | | Merge branch '19725-new-pipeline-auto-completion' into 'master' Robert Speicher2016-08-113-4/+30
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Update CHANGELOGula budziszewska2016-08-111-1/+0
View Lorry Controller Status