summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-remove-issue_to_atom' into 'master' Douwe Maan2016-05-255-28/+17
|\
| * Remove `issue_to_atom` helperrs-remove-issue_to_atomRobert Speicher2016-05-235-28/+17
* | Merge branch 'improve-pipeline-design' into 'master' Douwe Maan2016-05-2510-55/+44
|\ \
| * | Remove top block from builds pageimprove-pipeline-designAnnabel Dunstone2016-05-242-4/+0
| * | Remove icons from tables; remove timestamp from pipelines, remove info block ...Annabel Dunstone2016-05-247-32/+3
| * | Increase max-width of stage cellsAnnabel Dunstone2016-05-241-1/+1
| * | Merge branch 'master' into improve-pipeline-designKamil Trzcinski2016-05-2341-347/+455
| |\ \
| * | | Improve status renderingKamil Trzcinski2016-05-211-2/+2
| * | | Improve design of Pipeline viewKamil Trzcinski2016-05-214-21/+43
* | | | Merge branch 'rs-event-atom-partial' into 'master' Douwe Maan2016-05-258-48/+39
|\ \ \ \
| * | | | Render a collection for the Commits atom feedrs-event-atom-partialRobert Speicher2016-05-232-14/+15
| * | | | Remove `event_to_atom` helperRobert Speicher2016-05-236-34/+24
* | | | | Merge branch 'issue_10725' into 'master' Douwe Maan2016-05-251-1/+13
|\ \ \ \ \
| * | | | | Fix forks creation when visibility level is restrictedissue_10725Felipe Artur2016-05-251-1/+13
* | | | | | Merge branch 'zero-project-creation-error-message' into 'master' Robert Speicher2016-05-251-1/+7
|\ \ \ \ \ \
| * | | | | | Fixed project model testszero-project-creation-error-messagePhil Hughes2016-05-251-2/+2
| * | | | | | Updated erorr message when project limit is zeroPhil Hughes2016-05-241-1/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'closed-by-alignment' into 'master' Jacob Schatz2016-05-252-6/+4
|\ \ \ \ \ \
| * | | | | | Related merge request text alignmentclosed-by-alignmentPhil Hughes2016-05-232-6/+4
* | | | | | | Merge branch 'issue-filter-name-options' into 'master' Jacob Schatz2016-05-2510-71/+63
|\ \ \ \ \ \ \
| * | | | | | | Updated Ruby based on feedbackissue-filter-name-optionsPhil Hughes2016-05-242-15/+6
| * | | | | | | Fixed up JS commentsPhil Hughes2016-05-202-5/+4
| * | | | | | | Fixed issue with not being able to search text & filterPhil Hughes2016-05-162-2/+11
| * | | | | | | Fixed failing rubocop testsPhil Hughes2016-05-163-41/+10
| * | | | | | | Added issue_search parameterPhil Hughes2016-05-161-1/+1
| * | | | | | | Fixed testsPhil Hughes2016-05-162-12/+3
| * | | | | | | Fixed issue with not being able to sort and filterPhil Hughes2016-05-162-3/+12
| * | | | | | | Fixed Ruby issuesPhil Hughes2016-05-161-2/+1
| * | | | | | | Issuable filtering improvementsPhil Hughes2016-05-168-23/+48
* | | | | | | | Merge branch 'gitlab-import-status' into 'master' Jacob Schatz2016-05-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed issue with GitLab import buttons having a spinnergitlab-import-statusPhil Hughes2016-05-241-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'generic-commit-status' into 'master' Jacob Schatz2016-05-251-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Move tags to column in generic_commit_statusgeneric-commit-statusAnnabel Dunstone2016-05-241-7/+7
| |/ / / / / / /
* | | | | | | | Merge branch 'fix-grammar-issues' into 'master' Jacob Schatz2016-05-256-16/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve some issues Jacob brought up.Connor Shea2016-05-242-7/+7
| * | | | | | | | Fix grammar and wording in text on various pages.Connor Shea2016-05-226-18/+16
* | | | | | | | | Merge branch 'layout-nav-zindex' into 'master' Jacob Schatz2016-05-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Increased zindex of layout navlayout-nav-zindexPhil Hughes2016-05-251-1/+1
* | | | | | | | | | Merge branch 'merge-button-color-fix' into 'master' Jacob Schatz2016-05-252-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Fixed issue with button color when no CI enabledmerge-button-color-fixPhil Hughes2016-05-252-3/+4
* | | | | | | | | | Remove conditionalAlfredo Sumaran2016-05-251-2/+1
* | | | | | | | | | Make conditional a guard clauseAlfredo Sumaran2016-05-251-5/+5
* | | | | | | | | | Address feedbackAlfredo Sumaran2016-05-252-11/+13
* | | | | | | | | | Move conditional to a methodAlfredo Sumaran2016-05-252-1/+5
* | | | | | | | | | Fix syntaxAlfredo Sumaran2016-05-251-2/+2
* | | | | | | | | | Move todo target state to the top and fix styles on mobileAlfredo Sumaran2016-05-252-6/+8
* | | | | | | | | | Add target statusAlfredo Sumaran2016-05-253-0/+21
* | | | | | | | | | Merge branch 'issue_15221_2'Douwe Maan2016-05-252-7/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix outer join when filtering milestonesissue_15221_2Felipe Artur2016-05-242-2/+4
| * | | | | | | | | | Fix bug when ordering by milestone due date and filtering by milestoneFelipe Artur2016-05-241-1/+0