summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update CHANGELOG.md for 9.1.3v9.1.3Lin Jen-Shin2017-05-051-0/+1
| | | [ci skip]
* Update CHANGELOG.md for 9.1.3Lin Jen-Shin2017-05-052-4/+1
| | | [ci skip]
* Merge remote-tracking branch 'dev/9-1-stable' into 9-1-stableLin Jen-Shin2017-05-0510-33/+12
|\ | | | | | | | | | | * dev/9-1-stable: Update VERSION to 9.1.3 Update CHANGELOG.md for 9.1.3
| * Update VERSION to 9.1.3Lin Jen-Shin2017-05-051-1/+1
| |
| * Update CHANGELOG.md for 9.1.3Lin Jen-Shin2017-05-059-32/+11
| | | | | | [ci skip]
* | Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-048-19/+105
|/ | | | | Use GroupsFinder to find subgroups the user has access to See merge request !2096
* Fix the other failureLin Jen-Shin2017-05-041-1/+1
|
* Fix test errorLin Jen-Shin2017-05-041-1/+1
|
* Fix test failureLin Jen-Shin2017-05-041-1/+1
|
* Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-045-3/+29
| | | | | New Hamlit XSS fix, does not include extraneous changes See merge request !2095
* Merge branch 'snippets-finder-visibility' into 'security' Douwe Maan2017-05-0423-186/+389
| | | | | Refactor snippets finder & dont return internal snippets for external users See merge request !2094
* Merge branch 'branch-name-escape' into 'security'Robert Speicher2017-05-043-7/+19
| | | | | | Fix XSS in branches dropdown See merge request !2093
* Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-043-3/+80
| | | | | Respect project features in wiki and blob search See merge request !2089
* Merge branch 'snippets_visibility' into 'security' Sean McGivern2017-05-044-215/+161
| | | | | Fix snippets visibility for show action - external users can not see internal snippets See merge request !2087
* Merge branch 'droplab-templating-xss-fix' into 'master'Jacob Schatz2017-05-046-12/+21
| | | | | | droplab templating xss fix See merge request !2085
* Merge branch 'rs-sanitize-submodule-urls' into 'security' Douwe Maan2017-05-043-16/+46
| | | | | Sanitize submodule URLs before linking to them in the file tree view See merge request !2084
* Merge branch 'bvl-security-9-1-markup-pipeline' into 'security-9-1'Robert Speicher2017-05-047-32/+52
| | | | | | (security-9-1) Render asciidoc & other markup using banzai in a pipeline See merge request !2098
* Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri' into ↵Robert Speicher2017-05-044-56/+79
| | | | | | | | 'security-9-1' (security-9-1) Add correct `rel` attributes to external links when rendering markdown See merge request !2097
* Update VERSION to 9.1.2v9.1.2Timothy Andrew2017-05-011-1/+1
|
* Update CHANGELOG.md for 9.1.2Timothy Andrew2017-05-019-32/+11
| | | [ci skip]
* Merge branch 'fix-sidebar-block-ref-test' into 'master' Sean McGivern2017-04-282-5/+4
| | | | | add issues and merge-requests classes and use to find in rspec See merge request !10980
* Merge branch 'zj-accept-default-branch-param' into 'master' Douwe Maan2017-04-283-1/+6
| | | | | | | Accept default branch param on notifaction services Closes #31173 See merge request !10959
* Merge branch 'pages-0.4.1' into 'master' Kamil Trzciński2017-04-282-1/+5
| | | | | Use GitLab Pages v0.4.1 See merge request !10891
* Merge branch 'add_index_on_ci_runners_contacted_at' into 'master' Yorick Peterse2017-04-283-1/+25
| | | | | | | Add index on ci_runners.contacted_at Closes #31229 See merge request !10876
* Merge branch 'fix/github-importer' into 'master' Sean McGivern2017-04-2822-101/+930
| | | | | Refactoring rake task to import GitHub repositories See merge request !10695
* Merge branch 'opt-out-not-in' into 'master' Sean McGivern2017-04-281-1/+1
| | | | | correct documentation on opt-out-ness of usage ping See merge request !10945
* Merge branch 'dm-fix-ghost-user-validation' into 'master' Robert Speicher2017-04-283-1/+17
| | | | | Skip validation when creating internal (ghost, service desk) users See merge request !10949
* Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-285-7/+73
| | | | | | | Fix ordering of commits in the network graph. Closes #30973 See merge request !10936
* Merge branch ↵Sean McGivern2017-04-283-1/+29
| | | | | | | | | | '31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized' into 'master' Resolve "Milestone sidebar display incorect number of MR when minimized" Closes #31292 See merge request !10933
* Merge branch '30645-show-pipeline-events-description' into 'master' Kamil Trzciński2017-04-282-2/+6
| | | | | | | Remove description for build_events, add pipeline_events Closes #30645 See merge request !10908
* Merge branch '2246-uuid-is-nil-for-new-installation' into 'master'Sean McGivern2017-04-285-1/+25
| | | | | | | | Lazily set UUID in ApplicationSetting for new installations Closes gitlab-ee#2246 See merge request !10893
* 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
| | | [ci skip]
* Merge branch '31294-fix-oauth-users-do-not-need-to-be-confirmed' into ↵Sean McGivern2017-04-265-9/+61
|\ | | | | | | | | | | | | | | '9-1-stable' Ensures that OAuth/LDAP/SAML users don't need to be confirmed See merge request !10925
| * Fix logic in Users::CreateService broken by the fix for OAuth usersRémy Coutable2017-04-261-8/+15
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Ensures that OAuth/LDAP/SAML users don't need to be confirmedRémy Coutable2017-04-265-4/+49
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '31280-skip-issueables-without-project' into 'master' Sean McGivern2017-04-264-26/+65
|/ | | | | | | Skip issuable without a project in IssuableExtractor#extract Closes #31280 See merge request !10906
* Merge branch '31174-project-integration-service-sub-nav' into 'master' Alfredo Sumaran2017-04-264-2/+7
| | | | | | | Add sub-nav for Project Integration Services edit page Closes #31174 See merge request !10813
* Merge branch 'fix-usage-ping-doc-link' into 'master' Rémy Coutable2017-04-262-1/+5
| | | | | Fix usage ping docs link from empty cohorts page See merge request !10907
* 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 disabled See merge request !10904
| * 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
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '10860-stable-task-lists-wrap' into '9-1-stable' Jacob Schatz2017-04-252-13/+24
|\ \ | |/ |/| | | | | Wrap MR content -stable branch See merge request !10914
| * Wrap MR content -stable branchAnnabel Dunstone Gray2017-04-252-13/+24
|/
* Merge branch '30306-transaction-while-moving-issues-to-ghost-user' into ↵Yorick Peterse2017-04-254-11/+97
| | | | | | | | 'master' Add a transaction around `move_issues_to_ghost_user` See merge request !10465
* Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master' Kamil Trzciński2017-04-257-88/+137
| | | | | | | Properly expire cache for **all** MRs of a pipeline Closes #31040 See merge request !10770
* Merge branch 'fix/gb/fix-blocked-pipeline-duration' into 'master' Kamil Trzciński2017-04-253-20/+53
| | | | | | | Fix missing duration for blocked pipelines Closes #31264 See merge request !10856
* Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master' Kamil Trzciński2017-04-256-21/+114
| | | | | Fix incorrect commit status text on main project page See merge request !10863
* Merge branch 'add_index_on_ci_builds_updated_at' into 'master' Yorick Peterse2017-04-253-1/+25
| | | | | | | Add index on ci_builds.updated_at Closes #31251 See merge request !10870
* Merge branch 'gitaly-upgrade-doc' into 'master' Sean McGivern2017-04-251-0/+11
| | | | | | | Fix 9.1 Gitaly source update steps Closes #31288 See merge request !10877
* Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' Sean McGivern2017-04-254-5/+28
| | | | | Eliminate N+1 queries in loading namespaces for every issuable in milestones See merge request !10871