summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Use .some instead of .find for phantomjs compatibilityAlfredo Sumaran2016-10-131-9/+1
* Improve diff view switching and componentsAlfredo Sumaran2016-10-135-56/+49
* 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-136-158/+176
* Refactor JS codeAlfredo Sumaran2016-10-138-9/+542
* 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
* Fix specsSean McGivern2016-10-131-2/+2
* Allow setting content for resolutionsSean McGivern2016-10-134-11/+42
* Merge branch 'remove-unique-keyframes' into 'master' Annabel Dunstone Gray2016-10-132-42/+43
|\
| * Replace unique keyframes mixin with specific keyframe animation namesClement Ho2016-10-132-42/+43
* | Merge branch '22655-deployments-don-t-always-have-keep-around-refs' into 'mas...Rémy Coutable2016-10-131-1/+8
|\ \
| * | Handle case where deployment ref no longer exists22655-deployments-don-t-always-have-keep-around-refsSean McGivern2016-10-131-1/+8
* | | Merge branch 'use-language-colours-for-graph' into 'master' Sean McGivern2016-10-131-3/+3
|\ \ \
| * | | Use Linguist::Language[] instead of creating a hashGeorg G2016-10-101-5/+1
| * | | Use defined colour for a language when availableGeorg G2016-10-071-3/+7
* | | | Merge branch 'feature/issues-board' into 'master' Sean McGivern2016-10-1327-132/+166
|\ \ \ \
| * | | | Updated JS to work with issue index & showfeature/issues-boardPhil Hughes2016-10-124-4/+5
| * | | | Moved data attribute values into helper methodPhil Hughes2016-10-123-10/+14
| * | | | Updated to pass the board ID with the boards root to save conflicts with EEPhil Hughes2016-10-114-8/+11
| * | | | Fix board relates specsDouglas Barbosa Alexandre2016-10-111-1/+1
| * | | | Add Project::BoardLimitExcedeed error classDouglas Barbosa Alexandre2016-10-111-1/+3
| * | | | Update endpoint path for the frontendPhil Hughes2016-10-112-1/+20
| * | | | Remove Boards::BaseServiceDouglas Barbosa Alexandre2016-10-1111-14/+10
| * | | | Refactoring service to create a new issue in a board listDouglas Barbosa Alexandre2016-10-112-7/+13
| * | | | Fix links to issue boardsDouglas Barbosa Alexandre2016-10-113-3/+3
| * | | | Remove unused Projects::BoardListsController controllerDouglas Barbosa Alexandre2016-10-111-65/+0
| * | | | Update endpoints to handle with board issuesDouglas Barbosa Alexandre2016-10-111-2/+2
| * | | | Update endpoints to handle with board list changesDouglas Barbosa Alexandre2016-10-111-7/+11
| * | | | Update Boards::Lists::DestroyService to remove list on a specic boardDouglas Barbosa Alexandre2016-10-111-0/+4
| * | | | Update Projects::BoardsController#show to look up for a specific boardDouglas Barbosa Alexandre2016-10-111-2/+13
| * | | | Add index action to Projects::BoardsController to return project boardsDouglas Barbosa Alexandre2016-10-112-3/+12
| * | | | Add Boards::ListService service to list project boardsDouglas Barbosa Alexandre2016-10-111-0/+14
| * | | | Removes all labels from project boards when moving and issue to doneDouglas Barbosa Alexandre2016-10-111-1/+1
| * | | | Update Boards::Issues::MoveService to move issues on a specific boardDouglas Barbosa Alexandre2016-10-111-0/+4
| * | | | Update Boards::Issues::ListService to list issues for a board listDouglas Barbosa Alexandre2016-10-111-0/+4
| * | | | Update Boards::Lists::MoveService to move lists inside a specific boardDouglas Barbosa Alexandre2016-10-111-1/+2
| * | | | Update Boards::Lists::GenerateService to generate for a specific boardDouglas Barbosa Alexandre2016-10-111-4/+4
| * | | | Update Boards::Lists::CreateService to create lists for a specific boardDouglas Barbosa Alexandre2016-10-112-6/+5
| * | | | Add Boards::Lists::ListService to list lists for a specific boardDouglas Barbosa Alexandre2016-10-111-0/+9
| * | | | Update Boards::CreateService to handle with the has_many associationDouglas Barbosa Alexandre2016-10-111-5/+10
| * | | | Restrict the number of permitted boards per project to oneDouglas Barbosa Alexandre2016-10-111-1/+6
| * | | | Allow projects to have many boardsDouglas Barbosa Alexandre2016-10-111-2/+1
* | | | | Merge branch '23234-deleting-a-milestone-removes-source-branch-deletion-optio...Rémy Coutable2016-10-131-1/+4
|\ \ \ \ \
| * | | | | Maintain "force_remove_source_branch" options on Merge Request unless specifiedMark Fletcher2016-10-131-1/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'feature/cycle-analytics-2-backend' into 'master' Douwe Maan2016-10-131-4/+10
|\ \ \ \ \
View Lorry Controller Status