summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix data inconsistency issue for old artifacts by moving them to a currently ...Kamil Trzcinski2017-06-016-53/+27
* Merge branch 'fix-n-plus-one-queries-for-user-access' into 'master'Yorick Peterse2017-06-011-1/+8
|\
| * Fix N+1 queries for non-members in comment threadsfix-n-plus-one-queries-for-user-accessSean McGivern2017-06-011-1/+8
* | Merge branch '31602-display-whether-shared-runner-is-enabled-in-the-admin-das...Rémy Coutable2017-06-011-0/+6
|\ \
| * | Display Shared Runner status in Admin Dashboardvanadium232017-05-311-0/+6
* | | Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern2017-06-012-3/+3
|\ \ \
| * | | Fix: A diff comment on a change at last line of a file shows as two comments ...Valery Sizov2017-05-312-3/+3
* | | | Merge branch 'notebook-katex-fixes' into 'master'Filipa Lacerda2017-06-011-7/+17
|\ \ \ \
| * | | | fixed inline mathPhil Hughes2017-05-301-1/+2
| * | | | fixed spacing before inline mathPhil Hughes2017-05-301-1/+2
| * | | | fixed spacing because of removed &Phil Hughes2017-05-301-1/+2
| * | | | fixed & being renderedPhil Hughes2017-05-301-3/+2
| * | | | Fixes multi-line math in notebooksPhil Hughes2017-05-301-7/+15
* | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-0116-56/+42
|\ \ \ \ \
| * | | | | Consistent diff and blob size limit namesDouwe Maan2017-05-2916-56/+42
* | | | | | Merge branch 'dm-emails-are-not-user-references' into 'master'Sean McGivern2017-06-011-0/+1
|\ \ \ \ \ \
| * | | | | | Don't match email addresses or foo@bar as user referencesdm-emails-are-not-user-referencesDouwe Maan2017-05-311-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'dm-discussions-n-plus-1' into 'master'Sean McGivern2017-06-013-3/+9
|\ \ \ \ \ \
| * | | | | | Move includes call to scopedm-discussions-n-plus-1Douwe Maan2017-05-312-2/+2
| * | | | | | Resolve N+1 query issue with discussionsDouwe Maan2017-05-292-2/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-3176-286/+1431
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-3133-179/+261
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-319-24/+32
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-31128-1116/+1484
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-26279-1785/+2401
| | |\ \ \ \ \ \
| | * | | | | | | Add checks before redirect, remove status/traceLin Jen-Shin2017-05-242-8/+8
| | * | | | | | | Use controllers to redirectLin Jen-Shin2017-05-232-0/+76
| | * | | | | | | Fix JS dispatcher for job traceLin Jen-Shin2017-05-181-1/+1
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-1840-124/+246
| | |\ \ \ \ \ \ \
| | * | | | | | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-1731-66/+73
| * | | | | | | | | Merge branch 'task-list-2' into 'master'Filipa Lacerda2017-05-311-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Include deckar01-task_list with import instead of requireJared Deckard2017-05-231-1/+1
| | * | | | | | | | | Upgrade to task_list v2Jared Deckard2017-05-231-1/+1
| * | | | | | | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-3129-75/+1134
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | enable meta+enter shortcut to quick submitissue-edit-inlinePhil Hughes2017-05-304-6/+21
| | * | | | | | | | | | fixed issuable shortcuts not workingPhil Hughes2017-05-306-7/+27
| | * | | | | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-30162-1354/+1922
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | fixed up weird karma specs with tooltipPhil Hughes2017-05-263-8/+4
| | * | | | | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-project-move-warningPhil Hughes2017-05-264-4/+5
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | fixed issuable templates dropdown not showingPhil Hughes2017-05-251-1/+1
| | | * | | | | | | | | | | fixed GFM references not workingPhil Hughes2017-05-252-2/+3
| | | * | | | | | | | | | | fixed move issue specsPhil Hughes2017-05-251-1/+1
| | * | | | | | | | | | | | use formState to update loading of save buttonissue-edit-inline-project-move-warningPhil Hughes2017-05-263-15/+7
| | * | | | | | | | | | | | Warn before moving issue in inline edit formPhil Hughes2017-05-253-3/+20
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | renamed path to web_url in endpointPhil Hughes2017-05-252-3/+3
| | * | | | | | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-25299-2217/+2963
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | fixed bug with can? check when user is not logged inPhil Hughes2017-05-241-1/+1
| | * | | | | | | | | | | | Changed all data to come through the JSON script elementPhil Hughes2017-05-245-47/+30
| | * | | | | | | | | | | | Merge branch 'issue-edit-inline-getdata-after-update' into 'issue-edit-inline'Filipa Lacerda2017-05-241-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Get new data after inline edit saveissue-edit-inline-getdata-after-updatePhil Hughes2017-05-221-0/+5
View Lorry Controller Status