| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dz-restrict-autocomplete' into 'security-9-1' | Robert Speicher | 2017-05-31 | 1 | -1/+1 |
| | | | | | | Allow users autocomplete by author_id only for authenticated users See merge request !2100 | ||||
| * | Merge branch 'bvl-security-9-1-28917-contain-uploads-in-system-dir' into ↵ | Douwe Maan | 2017-05-31 | 4 | -7/+27 |
| | | | | | | | | 'security-9-1' (security-9-1) Upload files into `public/upload/system` instead of `public/upload` See merge request !2099 | ||||
| * | Revert "Merge remote-tracking branch 'dev/security-9-1' into 9-1-stable" | Timothy Andrew | 2017-05-30 | 5 | -28/+8 |
| | | | | | | This reverts commit cc1b069ff9bfee3374b005e588b03de10afba689, reversing changes made to 729c75f700b75ea7b67e61ab01694f9d12623af1. | ||||
| * | Merge remote-tracking branch 'origin/9-1-stable' into security-9-1 | Timothy Andrew | 2017-05-26 | 37 | -172/+375 |
| |\ | |||||
| | * | Merge branch '31978-cross-reference-fix' into 'master' | Sean McGivern | 2017-05-12 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | Fix cross referencing for private and internal projects Closes #31978 See merge request !11243 | ||||
| | * | Remove unexistent packages from dispatcher.js | Felipe Artur | 2017-05-12 | 1 | -2/+0 |
| | | | |||||
| | * | Merge branch 'fallback-localstorage-cases' into 'master'9-1-stable-cherry-pick-fallback-localstorage-cases | Phil Hughes | 2017-05-10 | 10 | -38/+140 |
| | | | | | | | | | | | | | | | | | Fallback localstorage cases Closes #30179 and #25788 See merge request !10937 | ||||
| | * | Merge branch 'fix/import-export-missing-attributes' into 'master' | Rémy Coutable | 2017-05-10 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | Include missing project attributes to Import/Export Closes gitlab-ee#2251 and #26333 See merge request !10880 | ||||
| | * | Merge branch '31271-fixmr-target-branch-selector-dropdown' into 'master' | Jacob Schatz | 2017-05-10 | 4 | -3/+53 |
| | | | | | | | | | | | | | | | | | Fix MR target branch select dropdown placement cut-off Closes #31271 See merge request !10902 | ||||
| | * | Merge branch 'center-related-merge-request-items-horizontally' into 'master' | Filipa Lacerda | 2017-05-10 | 1 | -1/+16 |
| | | | | | | | | | | | | | Center related merge request items horizontally See merge request !11163 | ||||
| | * | Merge branch 'merge-request-poll-json-endpoint' into 'master' | Filipa Lacerda | 2017-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Fixed bug where merge request JSON would show Closes #28909 See merge request !11096 | ||||
| | * | Merge branch 'fix-search-not-highlighting' into 'master' | Filipa Lacerda | 2017-05-10 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | Fixed search terms not highlight Closes #31997 See merge request !11198 | ||||
| | * | Merge branch 'tc-fix-private-subgroups-shown' into 'security' | Douwe Maan | 2017-05-04 | 3 | -6/+18 |
| | | | | | | | | | | | Use GroupsFinder to find subgroups the user has access to See merge request !2096 | ||||
| | * | Merge branch 'fix-hamlit-xss' into 'security-9-1' | Robert Speicher | 2017-05-04 | 3 | -3/+3 |
| | | | | | | | | | | | New Hamlit XSS fix, does not include extraneous changes See merge request !2095 | ||||
| | * | Merge branch 'snippets-finder-visibility' into 'security' | Douwe Maan | 2017-05-04 | 10 | -81/+69 |
| | | | | | | | | | | | Refactor snippets finder & dont return internal snippets for external users See merge request !2094 | ||||
| | * | Merge branch 'branch-name-escape' into 'security' | Robert Speicher | 2017-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | Fix XSS in branches dropdown See merge request !2093 | ||||
| | * | Merge branch 'snippets_visibility' into 'security' | Sean McGivern | 2017-05-04 | 1 | -9/+9 |
| | | | | | | | | | | | 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 Schatz | 2017-05-04 | 4 | -10/+13 |
| | | | | | | | | | | | | | droplab templating xss fix See merge request !2085 | ||||
| | * | Merge branch 'rs-sanitize-submodule-urls' into 'security' | Douwe Maan | 2017-05-04 | 1 | -16/+30 |
| | | | | | | | | | | | Sanitize submodule URLs before linking to them in the file tree view See merge request !2084 | ||||
| * | | Upload all files in `uploads/system` | Bob Van Landuyt | 2017-05-24 | 4 | -7/+27 |
| | | | | | | | | | | | - Move existing uploads there. - Rename the existing `system` namespace to `system0` | ||||
| * | | Allow users autocomplete by author_id only for authenticated users | Dmitriy Zaporozhets | 2017-05-06 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Fix for hamlit filter XSS in project import | Brian Neel | 2017-04-28 | 3 | -3/+3 |
| |/ | |||||
| * | Merge branch 'fix-sidebar-block-ref-test' into 'master' | Sean McGivern | 2017-04-28 | 1 | -2/+2 |
| | | | | | | 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 Maan | 2017-04-28 | 2 | -1/+2 |
| | | | | | | | | Accept default branch param on notifaction services Closes #31173 See merge request !10959 | ||||
| * | Merge branch 'dm-fix-ghost-user-validation' into 'master' | Robert Speicher | 2017-04-28 | 1 | -1/+3 |
| | | | | | | Skip validation when creating internal (ghost, service desk) users See merge request !10949 | ||||
| * | Merge branch '30973-fix-network-graph-ordering' into 'master' | Douwe Maan | 2017-04-28 | 1 | -1/+2 |
| | | | | | | | | Fix ordering of commits in the network graph. Closes #30973 See merge request !10936 | ||||
| * | Merge branch ↵ | Sean McGivern | 2017-04-28 | 1 | -1/+1 |
| | | | | | | | | | | | '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ński | 2017-04-28 | 1 | -2/+2 |
| | | | | | | | | 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 McGivern | 2017-04-28 | 1 | -0/+9 |
| | | | | | | | | | Lazily set UUID in ApplicationSetting for new installations Closes gitlab-ee#2246 See merge request !10893 | ||||
| * | Fix logic in Users::CreateService broken by the fix for OAuth users | Rémy Coutable | 2017-04-26 | 1 | -8/+15 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Ensures that OAuth/LDAP/SAML users don't need to be confirmed | Rémy Coutable | 2017-04-26 | 1 | -4/+4 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch '31174-project-integration-service-sub-nav' into 'master' | Alfredo Sumaran | 2017-04-26 | 3 | -2/+3 |
| | | | | | | | | 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 Coutable | 2017-04-26 | 1 | -1/+1 |
| | | | | | | 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 Speicher | 2017-04-25 | 1 | -4/+4 |
| |\ | | | | | | | | | 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-stable | Douwe Maan | 2017-04-25 | 1 | -4/+4 |
| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Wrap MR content -stable branch | Annabel Dunstone Gray | 2017-04-25 | 2 | -13/+24 |
| |/ | |||||
| * | Merge branch '30306-transaction-while-moving-issues-to-ghost-user' into ↵ | Yorick Peterse | 2017-04-25 | 1 | -11/+23 |
| | | | | | | | | | '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ński | 2017-04-25 | 3 | -57/+67 |
| | | | | | | | | 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ński | 2017-04-25 | 1 | -0/+4 |
| | | | | | | | | 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ński | 2017-04-25 | 2 | -3/+25 |
| | | | | | | Fix incorrect commit status text on main project page See merge request !10863 | ||||
| * | Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' | Sean McGivern | 2017-04-25 | 2 | -5/+9 |
| | | | | | | Eliminate N+1 queries in loading namespaces for every issuable in milestones See merge request !10871 | ||||
| * | Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master' | Sean McGivern | 2017-04-25 | 2 | -1/+9 |
| | | | | | | | | Ensure replying to an individual note by email creates a note with its own discussion ID Closes #31067 See merge request !10890 | ||||
| * | Merge branch '30676-project-export-email' into 'master' | Sean McGivern | 2017-04-24 | 1 | -1/+1 |
| | | | | | | | | Fix email not being sent after project export Closes #30676 See merge request !10578 | ||||
| * | Revert "Merge branch ↵ | Felipe Artur | 2017-04-21 | 5 | -88/+28 |
| | | | | | | | '30637-replace-delete-buttons-get-fork-cancel-confirmation' into 'master'" This reverts commit 0385b5b372dc2040dd4b39ed21b543ed263db55b. | ||||
| * | Merge branch 'sh-fix-issue-31215-2' into 'master' | Douwe Maan | 2017-04-22 | 1 | -1/+1 |
| | | | | | | | | Based on !10841 Fix Error 500 when referencing issue with project in pending delete Closes #31215 See merge request !10843 | ||||
| * | Merge branch '2989-run-cicd-pipelines-on-a-schedule-experimental-doc' into ↵ | Achilleas Pipinellis | 2017-04-22 | 1 | -1/+1 |
| | | | | | | | | | | | 'master' Add doc for scheduled trigger Closes #30440 See merge request !10591 | ||||
| * | Merge branch '31189-pipelines-error-state-stable' into '9-1-stable' | Phil Hughes | 2017-04-21 | 2 | -6/+19 |
| |\ | | | | | | | | | Port of 31189-pipelines-error-state to 9-1-stable See merge request !10844 | ||||
| | * | Port of 31189-pipelines-error-state to 9-1-stable31189-pipelines-error-state-stable | Filipa Lacerda | 2017-04-21 | 2 | -6/+19 |
| | | | |||||
| * | | Merge branch '30637-replace-delete-buttons-get-fork-cancel-confirmation' ↵ | Filipa Lacerda | 2017-04-21 | 5 | -28/+88 |
| |/ | | | | | | | | | | into 'master' Add Fork/Cancel confirmation to "Replace"/"Delete" buttons Closes #30637 See merge request !10602 | ||||
| * | Merge branch '31116-moved-icon-update' into 'master' | Phil Hughes | 2017-04-21 | 1 | -1/+1 |
| | | | | | | | | Update move icon to match others Closes #31116 See merge request !10790 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |