summaryrefslogtreecommitdiff
path: root/app/views/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue-title-description-realtime' into 'master' Phil Hughes2017-05-051-8/+3
|\
| * resolve discussionissue-title-description-realtimeRegis2017-05-052-5/+1
| * rename candescription to canUpdateIssueRegis2017-05-041-1/+1
| * fix tasks list spec in rspecRegis2017-05-031-0/+8
| * remove curr and previous states - extract tasks logic to tasks actionRegis2017-05-021-4/+0
| * resolve conflictRegis2017-05-0141-79/+102
| |\
| * \ fix merge conflict with issue_show hamlRegis2017-04-259-18/+22
| |\ \
| * | | render description - tasks work - gfm is juicyRegis2017-04-211-9/+3
* | | | Merge branch 'balsalmiq-support' into 'master' Phil Hughes2017-05-051-0/+4
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into balsalmiq-supportLuke "Jared" Bennett2017-05-0211-114/+89
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into 'balsalmiq-support'Luke "Jared" Bennett2017-05-023-4/+5
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into balsalmiq-supportLuke "Jared" Bennett2017-04-309-16/+10
| |\ \ \ \ \
| * | | | | | Fixed specsLuke "Jared" Bennett2017-04-281-1/+1
| * | | | | | Moved partialLuke "Jared" Bennett2017-04-281-0/+0
| * | | | | | Merge branch 'master' into balsalmiq-supportLuke "Jared" Bennett2017-04-2825-43/+79
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into balsalmiq-supportLuke "Jared" Bennett2017-04-277-20/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into 'balsalmiq-support'Luke "Jared" Bennett2017-04-2638-73/+113
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into 'balsalmiq-support'Luke "Jared" Bennett2017-04-1214-56/+51
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Finished feature specsLuke "Jared" Bennett2017-04-111-1/+1
| * | | | | | | | | Tidy balsamiq viewer and remove unused VueLuke "Jared" Bennett2017-04-101-2/+1
| * | | | | | | | | Get initial sql values back from file which is databaseJacob Schatz2017-04-101-3/+0
| * | | | | | | | | Initial balsamiq supportJacob Schatz2017-04-102-0/+8
* | | | | | | | | | Merge branch 'cycle-anyltics-landing-box-fix' into 'master' Annabel Dunstone Gray2017-05-051-11/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed cycle analytics intro box styling regressioncycle-anyltics-landing-box-fixPhil Hughes2017-05-051-11/+11
* | | | | | | | | | | Merge branch '31689-request-access-spacing' into 'master' Annabel Dunstone Gray2017-05-052-4/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 31689 Add default margin-top to user request table on project members page31689-request-access-spacingtauriedavis2017-05-042-4/+2
* | | | | | | | | | | | Support comments for personal snippetsJarka Kadlecova2017-05-0514-135/+8
* | | | | | | | | | | | Add instant comments supportKushal Pandya2017-05-051-1/+1
* | | | | | | | | | | | Merge branch 'merge-request-poll-json-endpoint' into 'master' Filipa Lacerda2017-05-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed bug where merge request JSON would showmerge-request-poll-json-endpointPhil Hughes2017-05-041-1/+1
* | | | | | | | | | | | | Merge branch 'adam-separate-slash-commands' into 'master' Rémy Coutable2017-05-058-9/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Display slash commands outcome when previewing Markdownadam-separate-slash-commandsRares Sfirlogea2017-05-048-9/+16
* | | | | | | | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-0432-149/+201
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Resolve "Web GUI: Unable to create new branch from commit SHA"Luke "Jared" Bennett2017-05-043-13/+8
| * | | | | | | | | | | | | Merge branch 'deploy-keys-load-async' into 'master' Filipa Lacerda2017-05-042-22/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-0419-94/+130
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-0327-147/+121
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Re-wrote to match our docs - still not 100% sure but closer than it wasPhil Hughes2017-04-282-13/+5
| | * | | | | | | | | | | | | | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-04-2825-43/+79
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add Vue with async deploy keysJacob Schatz2017-04-271-21/+12
| | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch '31760-add-tooltips-to-note-actions' into 'master' Filipa Lacerda2017-05-041-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Add tooltips to note action buttons31760-add-tooltips-to-note-actionsAnnabel Dunstone Gray2017-05-031-3/+3
| * | | | | | | | | | | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-042-4/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-042-4/+38
| * | | | | | | | | | | | | | | Merge branch 'tags-sort-default' into 'master' Robert Speicher2017-05-041-9/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Moved to a view spectags-sort-defaultPhil Hughes2017-05-041-0/+1
| | * | | | | | | | | | | | | | Fixed tags sort dropdown being emptyPhil Hughes2017-05-031-9/+7
| * | | | | | | | | | | | | | | Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master' Rémy Coutable2017-05-043-17/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Disable navigation to Pages config if Pages is disabledMark Fletcher2017-05-043-17/+11
| | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'always-show-latest-pipeline-in-commit-box' into 'master' Kamil Trzciński2017-05-041-8/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status