summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-11-3-2717-fix-issue-title-xss' into 'security-11-3'Jan Provaznik2018-10-241-4/+5
* Merge branch 'security-redact-links-11-3' into 'security-11-3'Jan Provaznik2018-10-244-0/+42
* Merge branch 'security-fix/control-headers-11-3' into 'security-11-3'Jan Provaznik2018-10-241-0/+9
* Merge branch 'security-if-51113-hash_tokens-11-3' into 'security-11-3'Jan Provaznik2018-10-246-46/+178
* Merge branch 'security-11-3-51527-xss-in-mr-source-branch' into 'security-11-3'Thiago Presa2018-10-241-9/+3
* Fix MR discussion not loaded issueMark Chao2018-10-122-5/+5
* Revert "Merge branch '51958-fix-mr-discussion-loading' into 'master'"Bob Van Landuyt2018-10-122-21/+4
* Merge branch 'sh-fix-project-deletion-with-export' into 'master'Robert Speicher2018-10-121-1/+1
* Merge branch '51958-fix-mr-discussion-loading' into 'master'Phil Hughes2018-10-122-4/+21
* Merge branch 'security-bw-confidential-titles-through-markdown-api-11-3' into...Bob Van Landuyt2018-10-041-1/+1
* Merge branch 'security-fix-leaking-private-project-namespace-11-3' into 'secu...Bob Van Landuyt2018-10-042-12/+20
* Merge branch 'security-osw-user-info-leak-discussions-11-3' into 'security-11-3'Bob Van Landuyt2018-10-041-1/+1
* Reverts changes to the runners tableFilipa Lacerda2018-10-033-89/+64
* Merge branch '51549-runners-table' into 'master'Annabel Dunstone Gray2018-10-033-64/+89
* Merge branch '51522-add-new-project-via-import-by-url-auto-populates-slug-but...Stan Hu2018-10-022-2/+2
* Merge branch 'sh-fix-forks-with-no-gravatar' into 'master'Rémy Coutable2018-10-023-16/+11
* Merge branch 'mr-discussion-expanding-bug-fixes' into 'master'Filipa Lacerda2018-10-021-1/+4
* Merge branch '50347-fix-scrolling-to-diff-note-after-incremental-rendering' i...Phil Hughes2018-10-024-23/+76
* Merge branch '51657-fix-merge-mr-from-fork-spec' into 'master'Robert Speicher2018-10-021-3/+3
* Merge branch 'security-fj-stored-xss-in-repository-imports-11-3' into 'securi...Bob Van Landuyt2018-09-251-1/+1
* Merge branch 'security-package-json-xss-11-3' into 'security-11-3'Bob Van Landuyt2018-09-251-1/+2
* Merge branch 'fix-events-finder-incomplete-11-3' into 'security-11-3'Bob Van Landuyt2018-09-243-1/+15
* Merge branch 'security-11-3-6881-project-group-approvers-leaks-private-group-...Bob Van Landuyt2018-09-2413-28/+68
* Merge branch 'security-11-3-gcp-token-exposed-by-kubernetes' into 'security-1...Bob Van Landuyt2018-09-242-7/+7
* Merge branch 'security-acet-issue-details-11-3' into 'security-11-3'Bob Van Landuyt2018-09-242-4/+6
* Merge branch '50944-unable-to-import-repository-undefined-method-import_file-...11-3-stable-prepare-rc10Douwe Maan2018-09-182-3/+7
* Merge branch '50956-web-terminal' into 'master'Phil Hughes2018-09-181-1/+1
* Merge branch 'mr-fixed-expanded-state-not-working' into 'master'11-3-stable-prepare-rc9Mike Greiling2018-09-171-6/+1
* Merge branch '51412-username-alignment-issue-on-mr-page' into 'master'Annabel Dunstone Gray2018-09-172-2/+3
* Merge branch '7573-show-click-to-expand-on-not-rendered-diffs' into 'master'Phil Hughes2018-09-131-1/+1
* Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master'11-3-stable-prepare-rc7Grzegorz Bizon2018-09-111-1/+1
* Merge branch 'fix-namespace-upload' into 'master'Kamil Trzciński2018-09-111-0/+4
* Merge branch '51375-fix-activity-pages' into 'master'Robert Speicher2018-09-111-1/+1
* Resolve "On master, inline diff view contains extra `+` and `-` signs"Tim Zallmann2018-09-101-1/+2
* Merge branch '38208-due-dates-system-notes' into 'master'Stan Hu2018-09-094-2/+28
|\
| * Add system note when due date is changedEva Kadlecová2018-09-094-2/+28
* | Resolve "Merge requests show outdated discussions on changes tab"André Luís2018-09-084-6/+36
* | Merge branch 'sh-fix-scope-error-container-repo' into 'master'Stan Hu2018-09-081-1/+1
|\ \
| * | Fix scoping errors occuring for ContainerRepository on some buildsStan Hu2018-09-071-1/+1
* | | Resolve "Create new project: Re-add project name field"Martin Wortschack2018-09-085-16/+62
|/ /
* | Merge branch 'tz-mr-new-datastructure' into 'master'Mike Greiling2018-09-0727-426/+479
|\ \
| * | Fix for a check that fails if no file can be selectedTim Zallmann2018-09-081-42/+46
| * | Fix typo on targetLine in mutationAndré Luís2018-09-071-1/+1
| * | Cosmetic changes to let setupTim Zallmann2018-09-073-57/+48
| * | Adapted so utils + actions don't include any mutations and mutations are alwa...Tim Zallmann2018-09-075-67/+78
| * | Fixes based on MR discussion around naming, mutations, handling of stateTim Zallmann2018-09-0710-24/+22
| * | Made the discussion tests artificial to have them stable, mocked RAF + RICTim Zallmann2018-09-071-0/+1
| * | Added new tests for newly added mutations, actions, utilsTim Zallmann2018-09-073-9/+3
| * | Fixed another rspec about collapsing notes after adding themTim Zallmann2018-09-072-7/+8
| * | Fix Linting ErrorTim Zallmann2018-09-071-1/+0
View Lorry Controller Status