summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'use-jquery-on-blob-fork-suggestion' into 'master' Jacob Schatz2017-04-242-29/+27
|\
| * Use jQuery niceness on blob_fork_suggestionuse-jquery-on-blob-fork-suggestionEric Eastwood2017-04-222-29/+27
* | Merge branch 'add-aria-to-icon' into 'master' Jacob Schatz2017-04-241-0/+5
|\ \
| * | Add testsClement Ho2017-04-181-1/+1
| * | Add aria to iconClement Ho2017-04-121-0/+5
* | | Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master' Sean McGivern2017-04-242-1/+9
|\ \ \
| * | | Ensure replying to an individual note by email creates a note with its own di...dm-fix-individual-notes-reply-attributesDouwe Maan2017-04-242-1/+9
* | | | Merge branch '31269-task-scroll' into 'master' Jacob Schatz2017-04-241-0/+4
|\ \ \ \
| * | | | Add normal wrapping to task lists31269-task-scrollAnnabel Dunstone Gray2017-04-211-0/+4
* | | | | Merge branch 'notebooklab-in-repo' into 'master' Jacob Schatz2017-04-2411-2/+478
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into notebooklab-in-reponotebooklab-in-repoPhil Hughes2017-04-1345-1910/+1895
| |\ \ \ \ \
| * | | | | | Pulled in latest changesPhil Hughes2017-04-131-14/+59
| * | | | | | Pulled in latest changes from NotebookLabPhil Hughes2017-04-131-0/+4
| * | | | | | Merge branch 'master' into notebooklab-in-repoPhil Hughes2017-04-1350-225/+345
| |\ \ \ \ \ \
| * | | | | | | Moved NotebookLab assets into repoPhil Hughes2017-04-1111-2/+429
* | | | | | | | Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' Sean McGivern2017-04-242-5/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-urlStan Hu2017-04-242-5/+9
| * | | | | | | | Eliminate N+1 queries in loading namespaces for every issuable in milestonesStan Hu2017-04-231-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'diff-discussion-buttons-spacing' into 'master' Annabel Dunstone Gray2017-04-241-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes the spacing around diff discussion buttonsdiff-discussion-buttons-spacingPhil Hughes2017-04-241-0/+1
* | | | | | | | | Merge branch 'sh-optimize-duplicate-routable-full-path' into 'master' Sean McGivern2017-04-241-2/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cache Routable#full_path in RequestStore to reduce duplicate route loadssh-optimize-duplicate-routable-full-pathStan Hu2017-04-241-2/+13
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master' Kamil Trzciński2017-04-243-57/+67
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor ExpirePipelineCacheWorker#performToon Claes2017-04-241-5/+11
| * | | | | | | | | Use a better performing query to find all MRs for pipelineToon Claes2017-04-242-9/+7
| * | | | | | | | | Properly expire cache for **all** MRs of a pipelineToon Claes2017-04-243-53/+59
* | | | | | | | | | Merge branch 'fix/gb/fix-blocked-pipeline-duration' into 'master' Kamil Trzciński2017-04-241-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix missing pipeline duration for blocked pipelinesGrzegorz Bizon2017-04-211-0/+4
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master' Kamil Trzciński2017-04-242-3/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Deprecate legacy CI/CD status helpersGrzegorz Bizon2017-04-211-1/+7
| * | | | | | | | | Fix lastest commit status text on main project pageGrzegorz Bizon2017-04-212-2/+18
* | | | | | | | | | Merge branch '30306-transaction-while-moving-issues-to-ghost-user' into 'mast...Yorick Peterse2017-04-241-11/+23
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Move records to the ghost user in a transaction.Timothy Andrew2017-04-241-11/+23
* | | | | | | | | | Merge branch '31072-activity-border' into 'master' Phil Hughes2017-04-242-2/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix border color on activities page31072-activity-borderAnnabel Dunstone Gray2017-04-212-2/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'submodules-no-dotgit' into 'master' Dmitriy Zaporozhets2017-04-221-5/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule_links: handle urls that don't end with .gitDavid Turner2017-04-211-5/+7
* | | | | | | | | | Disable import URL field in New project form since it's hidden by defaultDouwe Maan2017-04-211-2/+3
* | | | | | | | | | Merge branch '30618-change-placeholder-color' into 'master' Annabel Dunstone Gray2017-04-212-0/+30
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | fix placeholder visibilityAndy2017-04-212-0/+30
* | | | | | | | | | Merge branch '30672-versioned-markdown-cache' into 'master' Douwe Maan2017-04-212-82/+68
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Start versioning cached markdown fieldsNick Thomas2017-04-211-33/+68
| * | | | | | | | | Remove the ClearDatabaseCacheWorkerNick Thomas2017-04-212-49/+0
* | | | | | | | | | Merge branch 'dz-cleanup-add-users' into 'master' Douwe Maan2017-04-215-29/+21
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Refactor add_users method for project and groupdz-cleanup-add-usersDmitriy Zaporozhets2017-04-215-29/+21
* | | | | | | | | | Merge branch 'form-focus-previous-incorrect-form' into 'master' Filipa Lacerda2017-04-211-2/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed the preview keyboard shortcut focusing wrong tabPhil Hughes2017-04-211-2/+5
* | | | | | | | | | | Merge branch 'sh-fix-issue-31215-2' into 'master' Douwe Maan2017-04-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into sh-fix-issue-31215Lin Jen-Shin2017-04-21111-627/+966
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Fix Error 500 when referencing issue with project in pending deletesh-fix-issue-31215Stan Hu2017-04-201-1/+1
View Lorry Controller Status