summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'bvl-security-9-1-28917-contain-uploads-in-system-dir' into 'sec...Douwe Maan2017-05-2535-45/+960
| |\
| | * Fix changelog entryBob Van Landuyt2017-05-241-1/+1
| | * Don't rename routes that start with `system`Bob Van Landuyt2017-05-242-1/+12
| | * Upload all files in `uploads/system`Bob Van Landuyt2017-05-2435-45/+949
| |/
| * Merge branch 'dz-restrict-autocomplete' into 'security-9-1' Robert Speicher2017-05-073-11/+25
| |\
| | * Allow users autocomplete by author_id only for authenticated usersDmitriy Zaporozhets2017-05-063-11/+25
| |/
| * Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri' into 'sec...Robert Speicher2017-05-025-57/+72
| |\
| | * Validate URLs using URIBob Van Landuyt2017-05-025-57/+72
| * | Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-025-3/+29
| |\ \ | | |/ | |/|
| | * Update changelogBrian Neel2017-05-011-2/+2
| | * Add view specBrian Neel2017-05-011-0/+22
| | * Add changelog entryBrian Neel2017-04-281-0/+4
| | * Fix for hamlit filter XSS in project importBrian Neel2017-04-283-3/+3
| |/ |/|
| * Merge branch 'bvl-security-9-1-markup-pipeline' into 'security-9-1' Robert Speicher2017-05-027-32/+60
| |\ |/ /
| * Render asciidoc & other markup using banzai in a pipelineBob Van Landuyt2017-05-017-32/+60
|/
* Merge branch 'fix-sidebar-block-ref-test' into 'master' Sean McGivern2017-04-282-5/+4
* Merge branch 'zj-accept-default-branch-param' into 'master' Douwe Maan2017-04-283-1/+6
* Merge branch 'pages-0.4.1' into 'master' Kamil Trzciński2017-04-282-1/+5
* Merge branch 'add_index_on_ci_runners_contacted_at' into 'master' Yorick Peterse2017-04-283-1/+25
* Merge branch 'fix/github-importer' into 'master' Sean McGivern2017-04-2822-101/+930
* Merge branch 'opt-out-not-in' into 'master' Sean McGivern2017-04-281-1/+1
* Merge branch 'dm-fix-ghost-user-validation' into 'master' Robert Speicher2017-04-283-1/+17
* Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-285-7/+73
* Merge branch '31292-milestone-sidebar-display-incorect-number-of-mr-when-mini...Sean McGivern2017-04-283-1/+29
* Merge branch '30645-show-pipeline-events-description' into 'master' Kamil Trzciński2017-04-282-2/+6
* Merge branch '2246-uuid-is-nil-for-new-installation' into 'master'Sean McGivern2017-04-285-1/+25
* Update VERSION to 9.1.1v9.1.1Lin Jen-Shin2017-04-261-1/+1
* Update CHANGELOG.md for 9.1.1Lin Jen-Shin2017-04-2613-49/+15
* Merge branch '31294-fix-oauth-users-do-not-need-to-be-confirmed' into '9-1-st...Sean McGivern2017-04-265-9/+61
|\
| * 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-265-4/+49
* | Merge branch '31280-skip-issueables-without-project' into 'master' Sean McGivern2017-04-264-26/+65
|/
* Merge branch '31174-project-integration-service-sub-nav' into 'master' Alfredo Sumaran2017-04-264-2/+7
* Merge branch 'fix-usage-ping-doc-link' into 'master' Rémy Coutable2017-04-262-1/+5
* Merge branch 'rc/dm-fix-oauth-user-creation-9-1-stable' into '9-1-stable' Robert Speicher2017-04-256-5/+47
|\
| * Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabledrc/dm-fix-oauth-user-creation-9-1-stableDouwe Maan2017-04-256-5/+47
* | Merge branch '10860-stable-task-lists-wrap' into '9-1-stable' Jacob Schatz2017-04-252-13/+24
|\ \ | |/ |/|
| * 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-254-11/+97
* Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master' Kamil Trzciński2017-04-257-88/+137
* Merge branch 'fix/gb/fix-blocked-pipeline-duration' into 'master' Kamil Trzciński2017-04-253-20/+53
* Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master' Kamil Trzciński2017-04-256-21/+114
* Merge branch 'add_index_on_ci_builds_updated_at' into 'master' Yorick Peterse2017-04-253-1/+25
* Merge branch 'gitaly-upgrade-doc' into 'master' Sean McGivern2017-04-251-0/+11
* Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' Sean McGivern2017-04-254-5/+28
* Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master' Sean McGivern2017-04-254-1/+22
* Merge branch '30676-project-export-email' into 'master' Sean McGivern2017-04-242-1/+17
* Update VERSION to 9.1.0v9.1.0Felipe Artur2017-04-221-1/+1
* Update CHANGELOG.md for 9.1.0Felipe Artur2017-04-22246-990/+248
* Update VERSION to 9.1.0-rc7v9.1.0-rc7DJ Mountney2017-04-211-1/+1
View Lorry Controller Status