summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Execute specific named route method from toggle_award_url helper methodfaster_toggle_award_url_helper_methodPaco Guzman2016-10-182-3/+7
* Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-1844-586/+1560
|\
| * 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-1721-150/+317
| |\
| * \ Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-17246-1531/+3847
| |\ \
| * | | Update CHANGELOGAlfredo Sumaran2016-10-131-1/+0
| * | | Add syntax highlighting to filesAlfredo Sumaran2016-10-131-0/+1
| * | | Add blob_ace_mode to conflict content responseSean McGivern2016-10-133-0/+17
| * | | Fix discard messageAlfredo Sumaran2016-10-131-1/+1
| * | | Update CHANGELOGAlfredo Sumaran2016-10-131-0/+2
| * | | Use plain JS to get elements and data and valuesAlfredo Sumaran2016-10-131-5/+5
| * | | Remove unused filesAlfredo Sumaran2016-10-132-550/+0
| * | | Fix column limit on mysqlAlfredo Sumaran2016-10-131-1/+1
| * | | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-134-51/+101
| * | | Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-1317-76/+140
| * | | Use .some instead of .find for phantomjs compatibilityAlfredo Sumaran2016-10-131-9/+1
| * | | Improve diff view switching and componentsAlfredo Sumaran2016-10-136-61/+54
| * | | Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-133-2/+15
| * | | Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-137-159/+213
| * | | Refactor JS codeAlfredo Sumaran2016-10-1310-11/+545
| * | | Fix editor specSean McGivern2016-10-131-0/+1
| * | | Add tests to check if files are resolved with Edit Inline modeAlfredo Sumaran2016-10-131-0/+26
| * | | check if files is set before countingAlfredo Sumaran2016-10-131-0/+4
| * | | Replace loading text with spinnerAlfredo Sumaran2016-10-132-3/+4
| * | | Style for resolve conflicts formAlfredo Sumaran2016-10-132-10/+21
| * | | Styles for discard alertAlfredo Sumaran2016-10-133-6/+18
| * | | Replace textarea with Ace editorAlfredo Sumaran2016-10-134-8/+30
| * | | Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-1311-73/+300
| * | | We now support resolving conflicts with ambiguous markersDouwe Maan2016-10-131-1/+0
| * | | Simplify conflict file JSON creationSean McGivern2016-10-131-7/+15
| * | | Add JSON SchemaSean McGivern2016-10-132-0/+141
| * | | Fix resolve service specsSean McGivern2016-10-131-2/+2
| * | | Fix MR model specSean McGivern2016-10-131-6/+6
| * | | Fix specsSean McGivern2016-10-132-4/+4
| * | | Make RuboCop happySean McGivern2016-10-131-1/+0
| * | | Allow setting content for resolutionsSean McGivern2016-10-1311-42/+395
| * | | Add instrumentation to conflict classesSean McGivern2016-10-131-0/+1
* | | | 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
* | | | | Merge branch '23358-expand-hide-pipeline-btn-text-doesn-t-match' into 'master' Fatih Acet2016-10-171-1/+1
|\ \ \ \ \
| * | | | | Swapped button text manipulation outcomes for the toggle queryLuke Bennett2016-10-171-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'dz-rename-user-routes' into 'master'Robert Speicher2016-10-1717-98/+116
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add todo for deprecated user routes and more information about deprecation to...dz-rename-user-routesDmitriy Zaporozhets2016-10-172-1/+3
| * | | | Add user routing rename to CHANGELOGDmitriy Zaporozhets2016-10-131-0/+1
| * | | | Remove /u/ prefix from user pages in documentationDmitriy Zaporozhets2016-10-1313-87/+87
| * | | | Update users routing specDmitriy Zaporozhets2016-10-132-6/+18
| * | | | Rename users routing from /u/:username to /users/:username for consistency wi...Dmitriy Zaporozhets2016-10-121-4/+8
View Lorry Controller Status