Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ignore unknown OAuth sources in ApplicationSetting46783-removed-omniauth-provider-causing-invalid-application-setting | Rémy Coutable | 2018-06-26 | 4 | -17/+60 |
* | Merge branch 'docs-contributing-links' into 'master' | Achilleas Pipinellis | 2018-06-26 | 1 | -2/+2 |
|\ | |||||
| * | Update CONTRIBUTING.md to fix links | Marcel Amirault | 2018-06-14 | 1 | -2/+2 |
* | | Merge branch 'existing-gcp-accounts' into 'master' | Mike Greiling | 2018-06-25 | 2 | -1/+6 |
|\ \ | |||||
| * | | Add back copy for existing gcp accounts within offer bannerexisting-gcp-accounts | tauriedavis | 2018-06-25 | 2 | -1/+6 |
* | | | Merge branch '48339-sorting-by-name-on-explore-projects-page-renders-a-500-er... | Robert Speicher | 2018-06-25 | 3 | -6/+21 |
|\ \ \ | |||||
| * | | | Add CHANGELOG | Douglas Barbosa Alexandre | 2018-06-25 | 1 | -0/+5 |
| * | | | Fix sorting by name on explore projects page | Douglas Barbosa Alexandre | 2018-06-25 | 2 | -6/+16 |
* | | | | Merge branch 'changelog-code-style' into 'master' | Robert Speicher | 2018-06-25 | 2 | -19/+41 |
|\ \ \ \ | |||||
| * | | | | Improve shelling out in bin/changelog | Jacob Vosmaer (GitLab) | 2018-06-25 | 2 | -19/+41 |
|/ / / / | |||||
* | | | | Merge branch 'fix-alert-btn' into 'master' | Mike Greiling | 2018-06-25 | 2 | -1/+6 |
|\ \ \ \ | |||||
| * | | | | Do not style alert links that mimic buttons | Clement Ho | 2018-06-25 | 2 | -1/+6 |
* | | | | | Merge branch 'zj-exclude-geo-database-yaml' into 'master' | Robert Speicher | 2018-06-25 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Exclude Geo DB Yaml on CE too | Zeger-Jan van de Weg | 2018-06-25 | 1 | -1/+1 |
* | | | | | | Merge branch '33886-resolve-fsevents-issues' into 'master' | Clement Ho | 2018-06-25 | 4 | -133/+122 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Resolve "100% CPU for webpack-dev-server running in GDK" | Mike Greiling | 2018-06-25 | 4 | -133/+122 |
|/ / / / / | |||||
* | | | | | Merge branch 'unify-api-boards_spec.rb' into 'master' | Robert Speicher | 2018-06-25 | 1 | -1/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Bring changes from EE | Lin Jen-Shin | 2018-06-26 | 1 | -1/+0 |
* | | | | | 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 |
|/ / / / / / / / / / / / / |