summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-075-26/+52
* Merge branch 'remove-wiki-image-border-radius' into 'master' Fatih Acet2016-11-0411-15/+15
|\
| * Update avatar container name so it doesnt conflict with other image containersremove-wiki-image-border-radiusAnnabel Dunstone Gray2016-11-0311-15/+15
* | Merge branch 'add-matches-and-closest-element-extensions' into 'master' Fatih Acet2016-11-041-2/+4
|\ \
| * | Added Element extension with .matches and .closestadd-matches-and-closest-element-extensionsLuke "Jared" Bennett2016-10-311-2/+4
* | | Merge branch 'issue-board-new-label-new-list' into 'master' Fatih Acet2016-11-042-0/+15
|\ \ \
| * | | Creates new list from a new labelissue-board-new-label-new-listPhil Hughes2016-11-042-0/+15
* | | | Merge branch 'fixed-width-caret' into 'master' Fatih Acet2016-11-041-1/+1
|\ \ \ \
| * | | | Add width to caret to rid ourselves of the shiftfixed-width-caretJacob Schatz2016-11-041-1/+1
* | | | | Merge branch 'stylistic-changes-to-commit-title-bar' into 'master' Fatih Acet2016-11-042-36/+58
|\ \ \ \ \
| * | | | | Update commit page stylesAnnabel Dunstone Gray2016-11-042-59/+44
| * | | | | Update commit.scss to have correct lintingDimitrie Hoekstra2016-11-041-1/+1
| * | | | | added various changes to commit title areaDimitrie Hoekstra2016-11-042-46/+83
* | | | | | Merge branch 'issue_23032' into 'master' Sean McGivern2016-11-042-2/+20
|\ \ \ \ \ \
| * | | | | | Allow to test JIRA service when project does not have repositoryissue_23032Felipe Artur2016-11-042-2/+20
| |/ / / / /
* | | | | | Merge branch 'show-status-from-branch' into 'master' Rémy Coutable2016-11-0416-33/+71
|\ \ \ \ \ \
| * | | | | | Fetch locals to avoid undefined method/local errorshow-status-from-branchLin Jen-Shin2016-11-043-0/+3
| * | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-0453-386/+304
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-0461-382/+606
| |\ \ \ \ \ \ \
| * | | | | | | | Initialize @statuses in status rather than constructorLin Jen-Shin2016-11-031-1/+2
| * | | | | | | | Merge status_for and status, feedback:Lin Jen-Shin2016-11-034-9/+5
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-02293-507/+1139
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Always use multiline in viewLin Jen-Shin2016-10-281-1/+2
| * | | | | | | | | It's not used as a public API right now, feedback:Lin Jen-Shin2016-10-281-5/+4
| * | | | | | | | | Use multi-line conditions in view, feedback:Lin Jen-Shin2016-10-281-1/+2
| * | | | | | | | | Also pass ref hereLin Jen-Shin2016-10-271-1/+1
| * | | | | | | | | Also update for default project page, feedback:Lin Jen-Shin2016-10-273-7/+8
| * | | | | | | | | Still show status from pipelines, see:Lin Jen-Shin2016-10-273-17/+27
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-2651-137/+722
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-2585-274/+529
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Pass `@ref` along so we know which pipeline to showLin Jen-Shin2016-10-2413-18/+44
* | | | | | | | | | | | Merge branch 'feature/view-related-serializers' into 'master' Douwe Maan2016-11-049-0/+129
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Simplify implementation of entity serializersGrzegorz Bizon2016-11-047-23/+14
| * | | | | | | | | | | | Add tests for serialization entities, add user entityGrzegorz Bizon2016-11-043-2/+4
| * | | | | | | | | | | | Expose commit author if author existsGrzegorz Bizon2016-11-041-0/+2
| * | | | | | | | | | | | Fix specs related to deployments and environmentsGrzegorz Bizon2016-11-031-1/+1
| * | | | | | | | | | | | Exclude project information from environment entityGrzegorz Bizon2016-11-031-1/+0
| * | | | | | | | | | | | Remove project entity that was part of the PoCGrzegorz Bizon2016-11-032-11/+1
| * | | | | | | | | | | | Extend tests for environments serializerGrzegorz Bizon2016-11-031-1/+1
| * | | | | | | | | | | | Add manual actions for deployment serializationGrzegorz Bizon2016-11-031-1/+1
| * | | | | | | | | | | | Remove duplication from build serializer entityGrzegorz Bizon2016-11-031-8/+12
| * | | | | | | | | | | | Implement entities needed for environments foldersGrzegorz Bizon2016-11-036-22/+79
| * | | | | | | | | | | | Use entity request object in environment entityGrzegorz Bizon2016-11-023-9/+14
| * | | | | | | | | | | | Add PoC for resource serializersGrzegorz Bizon2016-11-026-0/+79
* | | | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-11-041-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/labels-api'Rémy Coutable2016-11-041-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Return conflict error in label API when title is taken by group labellabels-apiDouwe Maan2016-10-201-4/+0
* | | | | | | | | | | | | | | Merge branch 'rs-merge_request_params' into 'master' Robert Speicher2016-11-041-6/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Apply `*_params_ce + *_params_ee` pattern to MergeRequestsControllerRobert Speicher2016-11-041-6/+21
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' Douwe Maan2016-11-045-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
View Lorry Controller Status