Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Port Namespace#root_ancestor to CE | Lin Jen-Shin | 2018-06-26 | 2 | -0/+17 |
* | Bring changes from EEunify-some-models | Lin Jen-Shin | 2018-06-26 | 1 | -1/+1 |
* | Merge branch '46202-webide-file-states' into 'master' | Mike Greiling | 2018-06-25 | 4 | -20/+24 |
|\ | |||||
| * | Resolve "Introduce hover, active, focus states for files in sidebar of Web IDE" | Paul Slaughter | 2018-06-25 | 4 | -20/+24 |
|/ | |||||
* | Merge branch 'unify-some-projects-controllers' into 'master' | Robert Speicher | 2018-06-25 | 2 | -1/+2 |
|\ | |||||
| * | Bring changes from EE | Lin Jen-Shin | 2018-06-26 | 2 | -1/+2 |
* | | Merge branch '34371-vue-components-tech-debt' into 'master' | Mike Greiling | 2018-06-25 | 4 | -82/+88 |
|\ \ | |/ |/| | |||||
| * | Moves list_dropdown and footer components to a .vue file34371-vue-components-tech-debt | Filipa Lacerda | 2018-06-22 | 4 | -82/+88 |
* | | Merge branch 'jivl-update-gitlab-svg-package' into 'master' | Tim Zallmann | 2018-06-25 | 0 | -0/+0 |
|\ \ | |||||
| * | | update gitlab-svg versionjivl-update-gitlab-svg-package | Jose | 2018-06-25 | 2 | -4/+4 |
* | | | Merge branch 'fix-inconsistent-cancel-button' into 'master' | Clement Ho | 2018-06-25 | 3 | -3/+3 |
|\ \ \ | |||||
| * | | | Fix localized button string | Andreas Kämmerle | 2018-06-25 | 1 | -1/+1 |
| * | | | Externalize button string | Andreas Kämmerle | 2018-06-25 | 1 | -1/+1 |
| * | | | Change button text to more specific Discard draftfix-inconsistent-cancel-button | Andreas Kämmerle | 2018-06-25 | 3 | -3/+3 |
* | | | | Merge remote-tracking branch 'dev/master' | Alessio Caiazza | 2018-06-25 | 19 | -30/+166 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'security-html_escape_branch_name' into 'master' | Alessio Caiazza | 2018-06-25 | 3 | -2/+25 |
| |\ \ \ \ | |||||
| | * | | | | HTML escape branch name in project graphs page | Imre Farkas | 2018-06-19 | 3 | -2/+25 |
| * | | | | | Merge branch 'security-rd-do-not-show-internal-info-in-public-feed' into 'mas... | Alessio Caiazza | 2018-06-25 | 3 | -14/+38 |
| |\ \ \ \ \ | |||||
| | * | | | | | Hide events from internal projects in public feed for anonymous users | Rubén Dávila | 2018-06-12 | 3 | -14/+38 |
| * | | | | | | Merge branch 'security-html_escape_usernames' into 'master' | Alessio Caiazza | 2018-06-25 | 3 | -2/+15 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | HTML escape the name of the user in ProjectsHelper#link_to_member | Imre Farkas | 2018-06-15 | 3 | -2/+15 |
| * | | | | | | | Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master' | Alessio Caiazza | 2018-06-25 | 3 | -1/+15 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix xss for Markdown elements where [[_TOC_]] is enabled | Mark Chao | 2018-06-16 | 3 | -1/+15 |
| * | | | | | | | | Merge branch 'security-fj-bumping-sanitize-gem' into 'master' | Alessio Caiazza | 2018-06-25 | 6 | -11/+35 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into 'security-fj-bumping-sanitize-gem' | Douwe Maan | 2018-06-18 | 174 | -762/+978 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Update Gemfile.rails5.lock | Douwe Maan | 2018-06-18 | 1 | -4/+8 |
| | * | | | | | | | | | Add changelog item | Douwe Maan | 2018-06-18 | 1 | -0/+5 |
| | * | | | | | | | | | Whitelist text-align property for th and td | Douwe Maan | 2018-06-18 | 2 | -2/+13 |
| | * | | | | | | | | | Update gitlab-gollum-lib to 4.2.7.5 and sanitize to 4.6.5 | Francisco Javier López | 2018-06-15 | 2 | -5/+9 |
| * | | | | | | | | | | Update CHANGELOG.md for 10.7.6 | Alessio Caiazza | 2018-06-21 | 1 | -0/+16 |
| * | | | | | | | | | | Update CHANGELOG.md for 10.8.5 | Alessio Caiazza | 2018-06-21 | 1 | -0/+11 |
| * | | | | | | | | | | Update CHANGELOG.md for 11.0.1 | Alessio Caiazza | 2018-06-21 | 1 | -0/+11 |
* | | | | | | | | | | | Merge branch '45933-webide-fade-uneditable-area' into 'master' | Phil Hughes | 2018-06-25 | 2 | -2/+16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Resolve "Guide users towards editing capabilities in review mode of Web IDE" | Paul Slaughter | 2018-06-25 | 2 | -2/+16 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch '6591-dont-load-omniauth-if-not-enabled' into 'master' | Stan Hu | 2018-06-25 | 2 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add changelog entry6591-dont-load-omniauth-if-not-enabled | Lin Jen-Shin | 2018-06-25 | 1 | -0/+5 |
| * | | | | | | | | | | | Don't try to load omniauth if not enabled | Lin Jen-Shin | 2018-06-25 | 1 | -1/+3 |
* | | | | | | | | | | | | Merge branch 'fl-fix-tech-debt' into 'master' | Mike Greiling | 2018-06-25 | 6 | -129/+131 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Use Pascal Case for Vue components importsfl-fix-tech-debt | Filipa Lacerda | 2018-06-25 | 1 | -8/+8 |
| * | | | | | | | | | | | | Merge branch 'master' into fl-fix-tech-debt | Filipa Lacerda | 2018-06-25 | 361 | -2864/+10582 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Moves tabs.js component into a vue file | Filipa Lacerda | 2018-06-21 | 4 | -94/+96 |
| * | | | | | | | | | | | | | Moves remove_issue component into a .vue file | Filipa Lacerda | 2018-06-21 | 2 | -19/+19 |
* | | | | | | | | | | | | | | Merge branch 'feature/honor-saml-assurance-level' into 'master' | Douwe Maan | 2018-06-25 | 14 | -93/+435 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Honor saml assurance level to allow 2FA bypassing | Roger Rüttimann | 2018-06-25 | 14 | -93/+435 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master' | Douwe Maan | 2018-06-25 | 4 | -41/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Moves another RPC to mandatory | Zeger-Jan van de Weg | 2018-06-25 | 4 | -41/+22 |
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'unify-admin-controllers' into 'master' | Douwe Maan | 2018-06-25 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Bring changes from EE | Lin Jen-Shin | 2018-06-25 | 2 | -4/+4 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'zj-is-anchestor' into 'master' | Douwe Maan | 2018-06-25 | 3 | -369/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Update remote happens through Gitaly only | Zeger-Jan van de Weg | 2018-06-25 | 2 | -353/+29 |