summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Fix missing semicolon to make scss-lint happyfix-scss-lint-pipelinesStan Hu2016-10-181-1/+1
* Merge branch '19991-triggered-pipeline' into 'master' Jacob Schatz2016-10-181-17/+22
|\
| * Add API as trigger19991-triggered-pipelineAnnabel Dunstone Gray2016-10-171-0/+4
| * Trigger updatesAnnabel Dunstone Gray2016-10-101-2/+8
| * Fix icon alignmentAnnabel Dunstone Gray2016-10-101-0/+5
| * Add separate pipeline and commit columnsAnnabel Dunstone Gray2016-10-101-19/+9
* | Require missing Vue dependencyAlfredo Sumaran2016-10-181-0/+2
* | Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-187-0/+0
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-1823-565/+974
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-1769-454/+1573
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-1441-208/+355
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0865-1090/+1315
| |\ \ \ \ \
| * | | | | | add pipeline succeeded email notificationMike Greiling2016-10-051-0/+0
| * | | | | | update pipeline failed email marginsMike Greiling2016-10-051-0/+0
| * | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0441-177/+471
| |\ \ \ \ \ \
| * | | | | | | implement ci notification email template (first pass)Mike Greiling2016-09-226-0/+0
* | | | | | | | Merge branch '21192-retried-builds' into 'master' Jacob Schatz2016-10-183-3/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | show all builds in sidebar, including retriedAnnabel Dunstone Gray2016-10-182-3/+3
| * | | | | | | | Replace retried build icon with fa-refreshAnnabel Dunstone Gray2016-10-181-1/+2
| * | | | | | | | Add background color and icon to retried buildsAnnabel Dunstone Gray2016-10-183-0/+14
| * | | | | | | | Add tooltip icon to retried buildsAnnabel Dunstone2016-10-181-1/+1
* | | | | | | | | Merge branch 'login-fixups' into 'master' Rémy Coutable2016-10-181-2/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Use border-radius-default instead of hardcoding value.login-fixupsBryce Johnson2016-10-181-4/+4
| * | | | | | | | Fix top border-radius of tabs.Bryce Johnson2016-10-181-0/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'master' into issue_19734_2Phil Hughes2016-10-1818-457/+786
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-1814-432/+768
| |\ \ \ \ \ \ \
| | * | | | | | | Provide better error message to the usermerge-conflicts-editor-2Alfredo Sumaran2016-10-171-1/+1
| | * | | | | | | Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-174-108/+175
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-1770-458/+1649
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | Add syntax highlighting to filesAlfredo Sumaran2016-10-131-0/+1
| | * | | | | | | | Use plain JS to get elements and data and valuesAlfredo Sumaran2016-10-131-5/+5
| | * | | | | | | | Remove unused filesAlfredo Sumaran2016-10-132-550/+0
| | * | | | | | | | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-132-2/+4
| | * | | | | | | | Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-138-10/+93
| | * | | | | | | | Use .some instead of .find for phantomjs compatibilityAlfredo Sumaran2016-10-131-9/+1
| | * | | | | | | | Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-132-1/+14
| | * | | | | | | | Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-132-133/+150
| | * | | | | | | | Refactor JS codeAlfredo Sumaran2016-10-135-4/+537
| | * | | | | | | | check if files is set before countingAlfredo Sumaran2016-10-131-0/+4
| | * | | | | | | | Replace loading text with spinnerAlfredo Sumaran2016-10-131-2/+2
| | * | | | | | | | Style for resolve conflicts formAlfredo Sumaran2016-10-131-0/+4
| | * | | | | | | | Styles for discard alertAlfredo Sumaran2016-10-132-3/+14
| | * | | | | | | | Replace textarea with Ace editorAlfredo Sumaran2016-10-132-7/+27
| | * | | | | | | | Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-134-54/+260
| * | | | | | | | | Merge branch 'fix-username-validator-endpoint' into 'master' Stan Hu2016-10-171-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update endpoint to username validatorAlfredo Sumaran2016-10-171-1/+1
| * | | | | | | | | | Merge branch '21395-standarize-markdown-headlines' into 'master' Annabel Dunstone Gray2016-10-173-24/+17
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | change border color to variabletauriedavis2016-10-172-4/+4
| | * | | | | | | | | Apply better hierarchy to markdown headers and issue/mr titles21395-standarize-markdown-headlinestauriedavis2016-10-173-21/+14
* | | | | | | | | | | Add visibility level to project repositoryissue_19734_2Felipe Artur2016-10-172-59/+62
|/ / / / / / / / / /
View Lorry Controller Status