summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-043-6/+18
* Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-043-3/+3
* Merge branch 'snippets-finder-visibility' into 'security' Douwe Maan2017-05-0410-81/+69
* Merge branch 'branch-name-escape' into 'security'Robert Speicher2017-05-041-1/+1
* Merge branch 'snippets_visibility' into 'security' Sean McGivern2017-05-041-9/+9
* Merge branch 'droplab-templating-xss-fix' into 'master'Jacob Schatz2017-05-044-10/+13
* Merge branch 'rs-sanitize-submodule-urls' into 'security' Douwe Maan2017-05-041-16/+30
* Merge branch 'fix-sidebar-block-ref-test' into 'master' Sean McGivern2017-04-281-2/+2
* Merge branch 'zj-accept-default-branch-param' into 'master' Douwe Maan2017-04-282-1/+2
* Merge branch 'dm-fix-ghost-user-validation' into 'master' Robert Speicher2017-04-281-1/+3
* Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-281-1/+2
* Merge branch '31292-milestone-sidebar-display-incorect-number-of-mr-when-mini...Sean McGivern2017-04-281-1/+1
* Merge branch '30645-show-pipeline-events-description' into 'master' Kamil Trzciński2017-04-281-2/+2
* Merge branch '2246-uuid-is-nil-for-new-installation' into 'master'Sean McGivern2017-04-281-0/+9
* Fix logic in Users::CreateService broken by the fix for OAuth usersRémy Coutable2017-04-261-8/+15
* Ensures that OAuth/LDAP/SAML users don't need to be confirmedRémy Coutable2017-04-261-4/+4
* Merge branch '31174-project-integration-service-sub-nav' into 'master' Alfredo Sumaran2017-04-263-2/+3
* Merge branch 'fix-usage-ping-doc-link' into 'master' Rémy Coutable2017-04-261-1/+1
* Merge branch 'rc/dm-fix-oauth-user-creation-9-1-stable' into '9-1-stable' Robert Speicher2017-04-251-4/+4
|\
| * Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabledrc/dm-fix-oauth-user-creation-9-1-stableDouwe Maan2017-04-251-4/+4
* | Wrap MR content -stable branchAnnabel Dunstone Gray2017-04-252-13/+24
|/
* Merge branch '30306-transaction-while-moving-issues-to-ghost-user' into 'mast...Yorick Peterse2017-04-251-11/+23
* Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master' Kamil Trzciński2017-04-253-57/+67
* Merge branch 'fix/gb/fix-blocked-pipeline-duration' into 'master' Kamil Trzciński2017-04-251-0/+4
* Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master' Kamil Trzciński2017-04-252-3/+25
* Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' Sean McGivern2017-04-252-5/+9
* Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master' Sean McGivern2017-04-252-1/+9
* Merge branch '30676-project-export-email' into 'master' Sean McGivern2017-04-241-1/+1
* Revert "Merge branch '30637-replace-delete-buttons-get-fork-cancel-confirmati...Felipe Artur2017-04-215-88/+28
* Merge branch 'sh-fix-issue-31215-2' into 'master' Douwe Maan2017-04-221-1/+1
* Merge branch '2989-run-cicd-pipelines-on-a-schedule-experimental-doc' into 'm...Achilleas Pipinellis2017-04-221-1/+1
* Merge branch '31189-pipelines-error-state-stable' into '9-1-stable' Phil Hughes2017-04-212-6/+19
|\
| * Port of 31189-pipelines-error-state to 9-1-stable31189-pipelines-error-state-stableFilipa Lacerda2017-04-212-6/+19
* | Merge branch '30637-replace-delete-buttons-get-fork-cancel-confirmation' into...Filipa Lacerda2017-04-215-28/+88
|/
* Merge branch '31116-moved-icon-update' into 'master' Phil Hughes2017-04-211-1/+1
* Merge branch '30779-show-mr-subnav-issue-tracker' into 'master' Alfredo Sumaran2017-04-2111-9/+37
* Merge branch '9-1-issue-title-on-load' into '9-1-stable' Filipa Lacerda2017-04-201-12/+11
|\
| * same fix on stable for issue title poll on load visibility check9-1-issue-title-on-loadRegis2017-04-201-12/+11
* | Merge branch 'fix/29125' into 'master' Sean McGivern2017-04-203-1/+15
* | Merge branch 'usage-ping-port' into 'master'Sean McGivern2017-04-2023-2/+354
* | Merge branch 'group-milestone-date-fields-fix' into 'master' Filipa Lacerda2017-04-202-3/+6
* | Merge branch 'branches-sort-toggle-empty' into 'master' Alfredo Sumaran2017-04-202-9/+15
* | Merge branch 'hook_retries' into 'master' Douwe Maan2017-04-201-0/+2
* | Merge branch 'sh-issue-29247-fix' into 'master' Douwe Maan2017-04-201-0/+11
* | Merge branch '30951-start-discussion-toggle-clicking-divider-causes-ui-break'...Alfredo Sumaran2017-04-204-2/+9
|/
* Merge branch 'issuable-state-only-notes-and-description' into 'master' Sean McGivern2017-04-202-2/+2
* Merge branch 'project-group-icon-links' into 'master' Annabel Dunstone Gray2017-04-203-5/+11
* Merge branch '30985-cancel-pipelines' into 'master'Phil Hughes2017-04-205-0/+12
* Merge branch '30008-textarea-focus' into 'master'Filipa Lacerda2017-04-191-4/+7
* Merge branch 'disable-recent-search-on-boards' into 'master' Filipa Lacerda2017-04-191-7/+8