summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add local markdown versionlocal-markdown-versionJan Provaznik2019-02-0617-40/+118
| | | | | | Cached markdown version is composed both from global and local markdown version. This allows admins to bump version locally when needed (e.g. when external URL is changed).
* Merge branch 'mysql_validate_pre_truncate' into 'master'Stan Hu2019-02-061-2/+3
|\ | | | | | | | | Adds validation for schema_migration prior to truncate. See merge request gitlab-org/gitlab-ce!6459
| * Fix MySQL error when truncating a table that doesn't existJose Torres2019-02-051-2/+3
| | | | | | | | | | | | | | This adds a conditional statement before truncating the `schema_migrations` table. This comit also ports this code to Rails 5.
* | Merge branch 'chore/update-js-regex' into 'master'Stan Hu2019-02-065-8/+15
|\ \ | |/ |/| | | | | update js_regex 2.2.1 -> 3.1 See merge request gitlab-org/gitlab-ce!24433
| * add changelog entryRoger Rüttimann2019-02-051-0/+5
| |
| * remove unnuesd global regex flag gRoger Rüttimann2019-02-052-2/+2
| |
| * remove newly supported regex feature from validation error testRoger Rüttimann2019-01-141-2/+0
| |
| * fix initialization of JsRegex after js_regex gem update changeRoger Rüttimann2019-01-141-1/+1
| |
| * update js_regex versionRoger Rüttimann2019-01-142-5/+9
| |
* | Merge branch 'merge-dev-into-master' into 'master'Stan Hu2019-02-060-0/+0
|\ \ | | | | | | | | | | | | | | | | | | Merge dev.gitlab.org master into GitLab.com master Closes #54721, #56663, #2779, #2776, #2772, #2783, #2766, #2784, #2760, #2775, #2777, #2767, #2786, #2780, and #56860 See merge request gitlab-org/gitlab-ce!24935
| * | Resolve conflicts in spec/services/members/destroy_service_spec.rbStan Hu2019-02-051-4/+0
| | |
| * | Resolve conflicts in spec/policies/personal_snippet_policy_spec.rbStan Hu2019-02-051-3/+0
| | |
| * | Resolve conflicts in spec/lib/safe_zip/extract_spec.rbStan Hu2019-02-051-4/+0
| | |
| * | Resolve conflicts in spec/features/markdown/math_spec.rbStan Hu2019-02-051-4/+0
| | |
| * | Resolve conflicts in app/policies/personal_snippet_policy.rbStan Hu2019-02-051-3/+0
| | |
| * | Resolve conflicts in config/routes/import.rbStan Hu2019-02-051-4/+0
| | |
| * | Resolve conflict in projects/issues_controller.rbBrett Walker2019-02-051-4/+0
| | |
| * | Resolve conflict in email_pipeline.rbBrett Walker2019-02-051-4/+0
| | |
| * | Resolve conflict in app/views/layouts/nav/sidebar/_project.html.hamlFrancisco Javier López2019-02-051-4/+0
| | |
| * | Fix a conflict in GITALY_SERVER_VERSIONNick Thomas2019-02-051-4/+0
| | | | | | | | | | | | | | | | | | GitLab.com master now points at Gitaly v1.17.0. Dev master pointed at 1.14.1 due to a recent security release. That fix is present in 1.17.0 so it is safe to take the .com side here.
| * | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-02-0510-0/+38
| |\ \
| | * | Update CHANGELOG.md for 11.6.9GitLab Release Tools Bot2019-02-041-0/+7
| | | | | | | | | | | | [ci skip]
| | * | Update CHANGELOG.md for 11.6.8GitLab Release Tools Bot2019-01-301-0/+4
| | | | | | | | | | | | [ci skip]
| | * | Merge branch 'fix-rubyzip-require' into 'master'Yorick Peterse2019-01-301-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | [master] Fix requiring the rubyzip Gem See merge request gitlab/gitlabhq!2876
| | | * | Fix requiring the rubyzip GemYorick Peterse2019-01-301-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | In commit 6fa5fd8515e0f2d5a6341134560021f353d84362 the `require: false` was removed to ensure the Gem was loaded at run time. Unfortunately, the `require` necessary for the rubyzip Gem is "zip" and not "rubyzip". As a result, Bundler would not require the Gem. This meant that we would still run into constant errors when referring to `Zip::File`.
| | * | Merge branch 'dev-master' into 'master'Yorick Peterse2019-01-303-2/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | [master] Fix uninitialized constant with GitLab Pages deploy See merge request gitlab/gitlabhq!2875
| | | * | Fix uninitialized constant with GitLab Pages deployStan Hu2019-01-293-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pages:deploy step was failing with the following error: ``` unitialized constant SafeZip::Extract::Zip ``` Since license_finder already pulls in rubyzip, we can make it a required gem. We also use the scope operator to make the reference to Zip::File explicit.
| | * | | Update CHANGELOG.md for 11.7.2GitLab Release Tools Bot2019-01-291-0/+34
| | |/ / | | | | | | | | [ci skip]
| | * | Update CHANGELOG.md for 11.5.8GitLab Release Tools Bot2019-01-281-0/+27
| | | | | | | | | | | | [ci skip]
| | * | Update CHANGELOG.md for 11.7.1GitLab Release Tools Bot2019-01-2821-101/+30
| | | | | | | | | | | | [ci skip]
| | * | Merge branch '56860-fix-spec-race-condition-upside-the-head' into 'master'Douglas Barbosa Alexandre2019-01-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a JS race in a spec Closes #56860 See merge request gitlab-org/gitlab-ce!24684
| | * | Merge branch 'test-permissions' into 'master'Yorick Peterse2019-01-2835-95/+324
| | |\ \ | | | | | | | | | | | | | | | | | | | | [master] Pipelines section is available to unauthorized users See merge request gitlab/gitlabhq!2480
| | | * | [master] Pipelines section is available to unauthorized usersKamil Trzciński2019-01-2835-95/+324
| | |/ /
| | * | Merge branch 'fix/security-group-user-removal' into 'master'Yorick Peterse2019-01-2510-11/+114
| | |\ \ | | | | | | | | | | | | | | | | | | | | [master] Resolve "Removing a user from a private group doesn't remove them from group's project, if their project's role was changed" See merge request gitlab/gitlabhq!2629
| | | * | Add subresources removal to member destroy serviceJames Lopez2019-01-2510-11/+114
| | | | |
| | * | | Merge branch 'security-import-path-logging' into 'master'Yorick Peterse2019-01-258-17/+107
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [master] Fix error disclosure on Project Import See merge request gitlab/gitlabhq!2675
| | | * | | Fix path disclosure on Project ImportJames Lopez2019-01-078-17/+107
| | | | | |
| | * | | | Merge branch 'security-guests-can-see-list-of-merge-requests' into 'master'Yorick Peterse2019-01-257-20/+154
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Group Guests are no longer able to see merge requests See merge request gitlab/gitlabhq!2694
| | | * | | | Group Guests are no longer able to see merge requestsTiago Botelho2019-01-217-20/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group guests will only be displayed merge requests to projects they have a access level to, higher than Reporter. Visible projects will still display the merge requests to Guests
| | * | | | | Merge branch 'security-import-project-visibility' into 'master'Yorick Peterse2019-01-255-2/+219
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Fix Imported Project Retains Prior Visibility Setting See merge request gitlab/gitlabhq!2734
| | | * | | | | Fix tree restorer visibility levelJames Lopez2019-01-245-2/+219
| | | | | | | |
| | * | | | | | Merge branch 'security-contributed-projects' into 'master'Yorick Peterse2019-01-254-0/+56
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Fix contributed projects info is still visible even user enable private profile See merge request gitlab/gitlabhq!2743
| | | * | | | | | Fix contributed projects finder shown private infoJames Lopez2019-01-084-0/+56
| | | | | | | | |
| | * | | | | | | Merge branch 'security-do-not-process-mr-ref-for-guests' into 'master'Yorick Peterse2019-01-253-2/+17
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Don't process MR refs for guests in the notes See merge request gitlab/gitlabhq!2771
| | | * | | | | | | Don't process MR refs for guests in the notesOswaldo Ferreira2019-01-103-2/+17
| | | | | | | | | |
| | * | | | | | | | Merge branch 'security-22076-sanitize-url-in-names' into 'master'Yorick Peterse2019-01-2540-54/+84
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Sanitize user full name to clean up any URL to prevent mail clients from auto-linking URLs See merge request gitlab/gitlabhq!2793
| | | * | | | | | | | Add changelog entryKushal Pandya2019-01-221-0/+6
| | | | | | | | | | |
| | | * | | | | | | | Use `sanitize_name` to sanitize URL in user full nameKushal Pandya2019-01-2237-54/+56
| | | | | | | | | | |
| | | * | | | | | | | Add `sanitize_name` helper to sanitize URLs in user full nameKushal Pandya2019-01-222-0/+22
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'sh-fix-import-redirect-vulnerability' into 'master'Yorick Peterse2019-01-258-8/+43
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Alias GitHub and Bitbucket OAuth2 callback URLs See merge request gitlab/gitlabhq!2840
View Lorry Controller Status