summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* CE-EE parity for spec/models/repository_spec.rbrs-spec-models-parityRobert Speicher2018-06-251-7/+29
* Merge branch 'zj-exclude-geo-database-yaml' into 'master'Robert Speicher2018-06-251-1/+1
|\
| * Exclude Geo DB Yaml on CE tooZeger-Jan van de Weg2018-06-251-1/+1
* | Merge branch '33886-resolve-fsevents-issues' into 'master'Clement Ho2018-06-254-133/+122
|\ \
| * | Resolve "100% CPU for webpack-dev-server running in GDK"Mike Greiling2018-06-254-133/+122
|/ /
* | Merge branch 'unify-api-boards_spec.rb' into 'master'Robert Speicher2018-06-251-1/+0
|\ \
| * | Bring changes from EELin Jen-Shin2018-06-261-1/+0
* | | Merge branch '46202-webide-file-states' into 'master'Mike Greiling2018-06-254-20/+24
|\ \ \
| * | | Resolve "Introduce hover, active, focus states for files in sidebar of Web IDE"Paul Slaughter2018-06-254-20/+24
|/ / /
* | | Merge branch 'unify-some-projects-controllers' into 'master'Robert Speicher2018-06-252-1/+2
|\ \ \
| * | | Bring changes from EELin Jen-Shin2018-06-262-1/+2
| |/ /
* | | Merge branch '34371-vue-components-tech-debt' into 'master'Mike Greiling2018-06-254-82/+88
|\ \ \ | |/ / |/| |
| * | Moves list_dropdown and footer components to a .vue file34371-vue-components-tech-debtFilipa Lacerda2018-06-224-82/+88
* | | Merge branch 'jivl-update-gitlab-svg-package' into 'master'Tim Zallmann2018-06-250-0/+0
|\ \ \
| * | | update gitlab-svg versionjivl-update-gitlab-svg-packageJose2018-06-252-4/+4
* | | | Merge branch 'fix-inconsistent-cancel-button' into 'master'Clement Ho2018-06-253-3/+3
|\ \ \ \
| * | | | Fix localized button stringAndreas Kämmerle2018-06-251-1/+1
| * | | | Externalize button stringAndreas Kämmerle2018-06-251-1/+1
| * | | | Change button text to more specific Discard draftfix-inconsistent-cancel-buttonAndreas Kämmerle2018-06-253-3/+3
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'dev/master'Alessio Caiazza2018-06-2519-30/+166
|\ \ \ \
| * \ \ \ Merge branch 'security-html_escape_branch_name' into 'master'Alessio Caiazza2018-06-253-2/+25
| |\ \ \ \
| | * | | | HTML escape branch name in project graphs pageImre Farkas2018-06-193-2/+25
| * | | | | Merge branch 'security-rd-do-not-show-internal-info-in-public-feed' into 'mas...Alessio Caiazza2018-06-253-14/+38
| |\ \ \ \ \
| | * | | | | Hide events from internal projects in public feed for anonymous usersRubén Dávila2018-06-123-14/+38
| * | | | | | Merge branch 'security-html_escape_usernames' into 'master'Alessio Caiazza2018-06-253-2/+15
| |\ \ \ \ \ \
| | * | | | | | HTML escape the name of the user in ProjectsHelper#link_to_memberImre Farkas2018-06-153-2/+15
| * | | | | | | Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master'Alessio Caiazza2018-06-253-1/+15
| |\ \ \ \ \ \ \
| | * | | | | | | Fix xss for Markdown elements where [[_TOC_]] is enabledMark Chao2018-06-163-1/+15
| * | | | | | | | Merge branch 'security-fj-bumping-sanitize-gem' into 'master'Alessio Caiazza2018-06-256-11/+35
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into 'security-fj-bumping-sanitize-gem'Douwe Maan2018-06-18174-762/+978
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Update Gemfile.rails5.lockDouwe Maan2018-06-181-4/+8
| | * | | | | | | | | Add changelog itemDouwe Maan2018-06-181-0/+5
| | * | | | | | | | | Whitelist text-align property for th and tdDouwe Maan2018-06-182-2/+13
| | * | | | | | | | | Update gitlab-gollum-lib to 4.2.7.5 and sanitize to 4.6.5Francisco Javier López2018-06-152-5/+9
| * | | | | | | | | | Update CHANGELOG.md for 10.7.6Alessio Caiazza2018-06-211-0/+16
| * | | | | | | | | | Update CHANGELOG.md for 10.8.5Alessio Caiazza2018-06-211-0/+11
| * | | | | | | | | | Update CHANGELOG.md for 11.0.1Alessio Caiazza2018-06-211-0/+11
* | | | | | | | | | | Merge branch '45933-webide-fade-uneditable-area' into 'master'Phil Hughes2018-06-252-2/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resolve "Guide users towards editing capabilities in review mode of Web IDE"Paul Slaughter2018-06-252-2/+16
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '6591-dont-load-omniauth-if-not-enabled' into 'master'Stan Hu2018-06-252-1/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add changelog entry6591-dont-load-omniauth-if-not-enabledLin Jen-Shin2018-06-251-0/+5
| * | | | | | | | | | | Don't try to load omniauth if not enabledLin Jen-Shin2018-06-251-1/+3
* | | | | | | | | | | | Merge branch 'fl-fix-tech-debt' into 'master'Mike Greiling2018-06-256-129/+131
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use Pascal Case for Vue components importsfl-fix-tech-debtFilipa Lacerda2018-06-251-8/+8
| * | | | | | | | | | | | Merge branch 'master' into fl-fix-tech-debtFilipa Lacerda2018-06-25361-2864/+10582
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Moves tabs.js component into a vue fileFilipa Lacerda2018-06-214-94/+96
| * | | | | | | | | | | | | Moves remove_issue component into a .vue fileFilipa Lacerda2018-06-212-19/+19
* | | | | | | | | | | | | | Merge branch 'feature/honor-saml-assurance-level' into 'master'Douwe Maan2018-06-2514-93/+435
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Honor saml assurance level to allow 2FA bypassingRoger Rüttimann2018-06-2514-93/+435
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master'Douwe Maan2018-06-254-41/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \