Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update VERSION to 9.1.7v9.1.7 | Regis | 2017-06-07 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 9.1.7 | Regis | 2017-06-07 | 1 | -0/+4 |
| | | | [ci skip] | ||||
* | Merge branch 'bvl-fix-typo-renaming-appearance' into 'security-9-2' | Douwe Maan | 2017-06-07 | 3 | -3/+59 |
| | | | | | | Fix typo in moving the`appearance` folder in migrations See merge request !2116 | ||||
* | Update VERSION to 9.1.6v9.1.6 | Regis | 2017-06-02 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 9.1.6 | Regis | 2017-06-02 | 2 | -4/+4 |
| | | | [ci skip] | ||||
* | Add the `with_avatar` trait to projects factory | Bob Van Landuyt | 2017-06-02 | 1 | -0/+4 |
| | |||||
* | Merge branch '25934-project-snippet-vis' into 'security-9-2' | Douwe Maan | 2017-06-02 | 14 | -19/+207 |
| | | | | | | Fix visibility when referencing snippets See merge request !2101 | ||||
* | Merge branch 'bvl-move-project-uploads-correctly' into 'security-9-2' | Sean McGivern | 2017-06-02 | 3 | -2/+13 |
| | | | | | | Move the uploads in the correct folder when moving project/namespace See merge request !2112 | ||||
* | Update VERSION to 9.1.5v9.1.5 | Regis | 2017-05-31 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 9.1.5 | Regis | 2017-05-31 | 4 | -12/+6 |
| | | | [ci skip] | ||||
* | Merge branch 'dz-restrict-autocomplete' into 'security-9-1' | Robert Speicher | 2017-05-31 | 3 | -11/+25 |
| | | | | | 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 | 35 | -45/+960 |
| | | | | | | | 'security-9-1' (security-9-1) Upload files into `public/upload/system` instead of `public/upload` See merge request !2099 | ||||
* | Merge branch 'dz-api-x-frame' into 'security-9-2' | Robert Speicher | 2017-05-31 | 2 | -0/+5 |
| | | | | | | Restrict API X-Frame-Options to same origin See merge request !2103 | ||||
* | Revert "Merge remote-tracking branch 'dev/security-9-1' into 9-1-stable" | Timothy Andrew | 2017-05-30 | 43 | -1002/+56 |
| | | | | | This reverts commit cc1b069ff9bfee3374b005e588b03de10afba689, reversing changes made to 729c75f700b75ea7b67e61ab01694f9d12623af1. | ||||
* | Merge remote-tracking branch 'dev/security-9-1' into 9-1-stable | Timothy Andrew | 2017-05-30 | 43 | -56/+1002 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/9-1-stable' into security-9-1 | Timothy Andrew | 2017-05-26 | 103 | -589/+2065 |
| |\ | |/ |/| | |||||
* | | Update CHANGELOG.md for 9.1.4 | Felipe Artur | 2017-05-12 | 1 | -0/+1 |
| | | | | | | [ci skip] | ||||
* | | Update CHANGELOG.md for 9.1.4 | Felipe Artur | 2017-05-12 | 1 | -0/+1 |
| | | | | | | [ci skip] | ||||
* | | Update CHANGELOG.md for 9.1.4 | Felipe Artur | 2017-05-12 | 1 | -0/+1 |
| | | | | | | [ci skip] | ||||
* | | Update VERSION to 9.1.4v9.1.4 | Felipe Artur | 2017-05-12 | 1 | -1/+1 |
| | | |||||
* | | Update CHANGELOG.md for 9.1.4 | Felipe Artur | 2017-05-12 | 9 | -33/+11 |
| | | | | | | [ci skip] | ||||
* | | Merge branch 'fix/project-tree-saver-spec' into 'master' | Rémy Coutable | 2017-05-12 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | Fix project tree saver and fork spec failures Closes #31746 See merge request !11076 | ||||
* | | Merge branch 'fix/fork-spec-mysql' into 'master' | Stan Hu | 2017-05-12 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | Fix fork_spec failure to do with mySQL Closes #31870 See merge request !11121 | ||||
* | | Merge branch '31978-cross-reference-fix' into 'master' | Sean McGivern | 2017-05-12 | 3 | -6/+88 |
| | | | | | | | | | | | | | | Fix cross referencing for private and internal projects Closes #31978 See merge request !11243 | ||||
* | | Merge branch 'fix/gb/qa/fix-outdated-admin-area-link-title' into 'master' | Rémy Coutable | 2017-05-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Fix outdated 'Admin area' link label in GitLab QA Closes gitlab-qa#41 See merge request !10646 | ||||
* | | Remove unexistent packages from dispatcher.js | Felipe Artur | 2017-05-12 | 1 | -2/+0 |
| | | |||||
* | | Merge branch '9-1-stable-cherry-pick-fallback-localstorage-cases' into ↵ | Felipe Artur | 2017-05-10 | 19 | -41/+684 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | '9-1-stable' Merge branch 'fallback-localstorage-cases' into 'master' See merge request !11275 | ||||
| * | | Merge branch 'fallback-localstorage-cases' into 'master'9-1-stable-cherry-pick-fallback-localstorage-cases | Phil Hughes | 2017-05-10 | 19 | -41/+684 |
|/ / | | | | | | | | | | | | | | | 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 | 13 | -14/+113 |
| | | | | | | | | | | | | | | 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 ↵ | Rémy Coutable | 2017-05-10 | 5 | -11/+150 |
| | | | | | | | | | | | | | | | | | | | | '31274-creating-schedule-trigger--causes-http-500-when-accessing-settings-ci_cd' into 'master' Fix lazy error handling of cron parser Closes #31274 See merge request !10948 | ||||
* | | Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' | Douwe Maan | 2017-05-10 | 3 | -1/+16 |
| | | | | | | | | | | | | | | Don't blow up when email has no References header Closes gitlab-ee#2247 See merge request !11014 | ||||
* | | Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master' | Douwe Maan | 2017-05-10 | 4 | -11/+45 |
| | | | | | | | | | | | | | | | | Sort the network graph both by commit date and topographically Closes #30973 See merge request !11057 | ||||
* | | Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into ↵ | Sean McGivern | 2017-05-10 | 4 | -5/+58 |
| | | | | | | | | | | | | | | | | 'master' Handle incoming emails from aliases correctly See merge request !11079 | ||||
* | | Merge branch 'merge-request-poll-json-endpoint' into 'master' | Filipa Lacerda | 2017-05-10 | 2 | -1/+5 |
| | | | | | | | | | | | | | | 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 | 3 | -5/+34 |
| | | | | | | | | | | | | | | | | Fixed search terms not highlight Closes #31997 See merge request !11198 | ||||
* | | Update CHANGELOG.md for 9.1.3v9.1.3 | Lin Jen-Shin | 2017-05-05 | 1 | -0/+1 |
| | | | | | | [ci skip] | ||||
* | | Update CHANGELOG.md for 9.1.3 | Lin Jen-Shin | 2017-05-05 | 2 | -4/+1 |
| | | | | | | [ci skip] | ||||
* | | Merge remote-tracking branch 'dev/9-1-stable' into 9-1-stable | Lin Jen-Shin | 2017-05-05 | 10 | -33/+12 |
|\ \ | | | | | | | | | | | | | | | | * dev/9-1-stable: Update VERSION to 9.1.3 Update CHANGELOG.md for 9.1.3 | ||||
| * | | Update VERSION to 9.1.3 | Lin Jen-Shin | 2017-05-05 | 1 | -1/+1 |
| | | | |||||
| * | | Update CHANGELOG.md for 9.1.3 | Lin Jen-Shin | 2017-05-05 | 9 | -32/+11 |
| | | | | | | | | | [ci skip] | ||||
* | | | Merge branch 'tc-fix-private-subgroups-shown' into 'security' | Douwe Maan | 2017-05-04 | 8 | -19/+105 |
|/ / | | | | | | | | | Use GroupsFinder to find subgroups the user has access to See merge request !2096 | ||||
* | | Fix the other failure | Lin Jen-Shin | 2017-05-04 | 1 | -1/+1 |
| | | |||||
* | | Fix test error | Lin Jen-Shin | 2017-05-04 | 1 | -1/+1 |
| | | |||||
* | | Fix test failure | Lin Jen-Shin | 2017-05-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'fix-hamlit-xss' into 'security-9-1' | Robert Speicher | 2017-05-04 | 5 | -3/+29 |
| | | | | | | | | | | 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 | 23 | -186/+389 |
| | | | | | | | | | | 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 | 3 | -7/+19 |
| | | | | | | | | | | | | Fix XSS in branches dropdown See merge request !2093 | ||||
* | | Merge branch '31157-respect-project-features-in-wiki-search' into 'security' | Douwe Maan | 2017-05-04 | 3 | -3/+80 |
| | | | | | | | | | | Respect project features in wiki and blob search See merge request !2089 |