summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow feature flag names to be a symbolda-feature-flagsDouglas Barbosa Alexandre2018-07-192-8/+26
|
* Merge branch '5594-geo-add-repository-verification-failures-to-api' into ↵Douglas Barbosa Alexandre2018-07-192-3/+23
|\ | | | | | | | | | | | | 'master' Backport of gitlab-org/gitlab-ee!6137 See merge request gitlab-org/gitlab-ce!20699
| * Backport of gitlab-org/gitlab-ee!6137Valery Sizov2018-07-192-3/+23
|/
* Merge branch 'gitaly-ff-branch-nil' into 'master'Rémy Coutable2018-07-194-11/+141
|\ | | | | | | | | | | | | Add missing Gitaly branch_update nil checks Closes #49263 See merge request gitlab-org/gitlab-ce!20711
| * Add missing Gitaly branch_update nil checksJacob Vosmaer (GitLab)2018-07-194-11/+141
|/
* Merge branch 'add-total-time-flat-printer-for-profiling' into 'master'Rémy Coutable2018-07-194-0/+81
|\ | | | | | | | | Add a Gitlab::Profiler.print_by_total_time convenience method See merge request gitlab-org/gitlab-ce!20715
| * Add a Gitlab::Profiler.print_by_total_time convenience methodSean McGivern2018-07-194-0/+81
| | | | | | | | | | | | | | This method uses Gitlab::Profiler::TotalTimeFlatPrinter internally, which is the same as RubyProf::FlatPrinter, but the min_percent option (and new max_percent option) applies to the _total_ time, not the _self_ time. This helps us figure out if we're calling a library inefficiently, for instance.
* | Merge branch '49413-test-action-no-return' into 'master'Filipa Lacerda2018-07-192-7/+30
|\ \ | | | | | | | | | | | | | | | | | | Allow testAction to work for async actions that don't return a Promise Closes #49413 See merge request gitlab-org/gitlab-ce!20718
| * | allow for testAction to wait until all promises are resolvedLukas Eipert2018-07-192-7/+30
| | |
* | | Merge branch 'frozen-string-enable-apps-services-inner-even-more' into 'master'Rémy Coutable2018-07-1935-0/+73
|\ \ \ | |/ / |/| | | | | | | | Enable more frozen string in app/services/**/*.rb See merge request gitlab-org/gitlab-ce!20702
| * | Enable more frozen string in app/services/**/*.rbgfyoung2018-07-1835-0/+73
| | | | | | | | | | | | Partially addresses #47424.
* | | Merge branch 'remove-duplicated-include' into 'master'Rémy Coutable2018-07-191-1/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove duplicated include IgnorableColumn in user model See merge request gitlab-org/gitlab-ce!20710
| * | | Remove duplicated include IgnorableColumnLin Jen-Shin2018-07-191-1/+0
| | | | | | | | | | | | | | | | It's probably duplicated during resolving a conflict?
* | | | Merge branch 'sh-normalize-urls' into 'master'Grzegorz Bizon2018-07-193-7/+19
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Escape username and password in UrlSanitizer#full_url See merge request gitlab-org/gitlab-ce!20684
| * | | Escape username and password in UrlSanitizer#full_urlStan Hu2018-07-193-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a user uses a password with certain characters (e.g. /, #, +, etc.) UrlSanitizer#full_url will generate an invalid URL that cannot be parsed properly by Addressable::URI. If used with UrlBlocker, this will be flagged as an invalid URI.
* | | | Merge branch 'use-rugged-for-reference-validator' into 'master'Douwe Maan2018-07-192-5/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use rugged to validate ref name Closes #49043 See merge request gitlab-org/gitlab-ce!20669
| * | | | Use rugged to validate ref nameAhmad Hassan2018-07-192-5/+8
| | | | |
* | | | | Merge branch 'rails5-fix-revert-modal-spec' into 'master'Rémy Coutable2018-07-192-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix user sees revert modal spec See merge request gitlab-org/gitlab-ce!20706
| * | | | | Rails5 fix user sees revert modal specJasper Maes2018-07-192-0/+8
| | |/ / / | |/| | |
* | | | | Merge branch '43312-remove_user_activity_workers' into 'master'Rémy Coutable2018-07-1918-333/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete UserActivities and related workers Closes #43312 See merge request gitlab-org/gitlab-ce!20597
| * | | | | Delete UserActivities and related workers43312-remove_user_activity_workersImre Farkas2018-07-1818-333/+66
| | | | | |
* | | | | | Merge branch 'regen-2fa-codes' into 'master'Douwe Maan2018-07-192-1/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add button to regenerate 2FA codes. Closes #48408 See merge request gitlab-org/gitlab-ce!20295
| * | | | | | Add button to regenerate 2FA codes.Luke Picciau2018-07-192-1/+12
|/ / / / / /
* | | | | | Merge branch 'accept-rf3-2822-compliant-addresses' into 'master'repo-forks/gitlab-ce-frozen-string-enable-apps-services-inner-even-moreSean McGivern2018-07-194-14/+62
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve email address parsing Closes #44676 See merge request gitlab-org/gitlab-ce!18192
| * | | | | Improve email address parsingGeorge Thomas2018-07-194-14/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you enter the following RFC 2822 compliant address: `John Doe <john@doe.com>` Gitlab will attempt to send three emails: 1) John 2) Doe 3) john@doe.com With this change given the following: `John Doe <johndoe@example.com>` `Jane Doe <janedoe@example.com>` Gitlab will send emails to `johndoe@example.com` and `janedoe@example.com`
* | | | | | Merge branch 'gitaly-remote-branches' into 'master'Douwe Maan2018-07-199-95/+73
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Incorporate Gitaly's RefService.FindAllRemoteBranches RPC See merge request gitlab-org/gitlab-ce!20701
| * | | | | Incorporate Gitaly's RefService.FindAllRemoteBranches RPCgitaly-remote-branchesAlejandro Rodríguez2018-07-189-95/+73
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sh-limit-unauthenticated-session-times' into 'master'Robert Speicher2018-07-184-0/+51
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Limit the TTL for anonymous sessions to 1 hour Closes #48101 See merge request gitlab-org/gitlab-ce!20700
| * | | | Limit the TTL for anonymous sessions to 1 hourStan Hu2018-07-184-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, all sessions are given the same expiration time configured in the session store (e.g. 1 week). However, unauthenticated users can generate a lot of sessions, primarily for CSRF verification. It makes sense to reduce the TTL for unauthenticated to something much lower than the default (e.g. 1 hour) to limit Redis memory. In addition, Rails creates a new session after login, so the short TTL doesn't even need to be extended. Closes #48101
* | | | | Merge branch 'leipert-proper-icon-validator' into 'master'Mike Greiling2018-07-1822-61/+123
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proper icon validator Closes #49236 See merge request gitlab-org/gitlab-ce!20620
| * | | | | Proper icon validatorLukas Eipert2018-07-1822-61/+123
|/ / / / /
* | | | | Merge branch 'toggle-password-cluster' into 'master'Annabel Gray2018-07-184-1/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toggle Show / Hide Button for Kubernetes Password Closes #49193 See merge request gitlab-org/gitlab-ce!20659
| * | | | | Toggle Show / Hide Button for Kubernetes Passwordgfyoung2018-07-184-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | Closes #49193.
* | | | | | Merge branch '41784-monitoring-graph-popovers' into 'master'Clement Ho2018-07-183-8/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix arrow for popovers on monitoring graph" Closes #41784 See merge request gitlab-org/gitlab-ce!20655
| * | | | | | Resolve "Fix arrow for popovers on monitoring graph"Annabel Gray2018-07-183-8/+40
|/ / / / / /
* | | | | | Merge branch '_acet-fix-expanding-context-lines' into 'master'Tim Zallmann2018-07-184-4/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rendering context lines on MR diffs Closes #49242 and #49343 See merge request gitlab-org/gitlab-ce!20642
| * | | | | Add CHANGELOG._acet-fix-expanding-context-linesFatih Acet2018-07-171-0/+5
| | | | | |
| * | | | | Remove v-once from diff lines components.Fatih Acet2018-07-173-4/+0
| | | | | |
* | | | | | Merge branch '49324-add-support-for-tar-gz-autodevops-charts' into 'master'Kamil Trzciński2018-07-182-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add support for tar.gz AUTO_DEVOPS_CHART charts" Closes #49324 See merge request gitlab-org/gitlab-ce!20691
| * | | | | | Add support for tar.gz AUTO_DEVOPS_CHART charts (#49324)Dylan Griffith2018-07-182-0/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '_acet-fix-mr-autosave' into 'master'Tim Zallmann2018-07-1810-50/+106
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix autosave issues for MR discussions Closes #48876 and #48877 See merge request gitlab-org/gitlab-ce!20569
| * | | | | | i18n changes on gitlab.pot.Fatih Acet2018-07-181-0/+3
| | | | | | |
| * | | | | | Revert debounce.Fatih Acet2018-07-182-25/+3
| | | | | | |
| * | | | | | Fix resetting autosave value after cancel.Fatih Acet2018-07-181-1/+1
| | | | | | |
| * | | | | | i18n changes for note cancel confirmations.Fatih Acet2018-07-182-2/+7
| | | | | | |
| * | | | | | Add disposeAutoSave method autosave mixin.Fatih Acet2018-07-182-1/+4
| | | | | | |
| * | | | | | Debounce Autosave callback.Fatih Acet2018-07-182-10/+28
| | | | | | |
| * | | | | | Add CHANGELOG.Fatih Acet2018-07-181-0/+5
| | | | | | |
| * | | | | | Fix failing specs :fingers-crossed:Fatih Acet2018-07-183-14/+46
| | | | | | |
| * | | | | | Fix autosave in noteable discussion.Fatih Acet2018-07-182-18/+16
| | | | | | |