Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update CHANGELOG.md for 8.16.7v8.16.7 | James Lopez | 2017-02-27 | 1 | -0/+1 |
| | | | [ci skip] | ||||
* | Update CHANGELOG.md for 8.16.7 | James Lopez | 2017-02-27 | 1 | -0/+1 |
| | | | [ci skip] | ||||
* | Update VERSION to 8.16.7 | James Lopez | 2017-02-27 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 8.16.7 | James Lopez | 2017-02-27 | 2 | -4/+4 |
| | | | [ci skip] | ||||
* | Merge branch 'fix-compare-service-signature' into '8-16-stable' | James Lopez | 2017-02-27 | 1 | -3/+2 |
|\ | | | | | | | | | Fix CompareService signature See merge request !9515 | ||||
| * | Fix CompareService signaturefix-compare-service-signature | Sean McGivern | 2017-02-24 | 1 | -3/+2 |
| | | | | | | | | | | In 8.17+, this takes two arguments to `new`, and two for `execute`. In 8.16, it takes four to `execute`. | ||||
* | | fix migration | James Lopez | 2017-02-24 | 1 | -0/+3 |
|/ | |||||
* | Revert "Merge branch '28357-colon-search' into 'master' " | James Lopez | 2017-02-24 | 4 | -32/+2 |
| | | | | This reverts commit f948c2f4ec03c544a1453714189599d02bcd99e8. | ||||
* | Merge branch 'fix-mr-size-with-over-100-files' into 'master' | Sean McGivern | 2017-02-24 | 3 | -1/+53 |
| | | | | | | | Fix MR changes tab size count Closes #27563 See merge request !9091 | ||||
* | Merge branch '28357-colon-search' into 'master' | Clement Ho | 2017-02-24 | 4 | -2/+32 |
| | | | | | | | Allow searching issues for strings containing colons Closes #28357 See merge request !9400 | ||||
* | Merge branch 'patch-12' into 'master' | James Lopez | 2017-02-24 | 2 | -2/+2 |
| | | | | | Fix hash of ruby in update documentation See merge request !8735 | ||||
* | Update VERSION to 8.16.6v8.16.6 | DJ Mountney | 2017-02-17 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 8.16.6 | DJ Mountney | 2017-02-17 | 14 | -53/+16 |
| | | | [ci skip] | ||||
* | Merge branch '28124-mrs-don-t-show-all-merge-errors' into 'master' | Rémy Coutable | 2017-02-17 | 5 | -17/+102 |
| | | | | | | | | | | Show merge errors in merge request widget Closes #28124 and gitlab-ee#1652 See merge request !9229 Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch 'fix-smart-interval-not-larger-than' into '8-16-stable' | James Lopez | 2017-02-16 | 1 | -1/+1 |
|\ | | | | | | | | | Fix smart interval 8-16-stable failure See merge request !9310 | ||||
| * | Change toBe to toBeLessThan to account for flakey timers, spec needs ↵fix-smart-interval-not-larger-than | Luke "Jared" Bennett | 2017-02-16 | 1 | -1/+1 |
|/ | | | | refactoring a little so this is not a complete fix | ||||
* | Fix spec failures in spec/javascripts/search_autocomplete_spec.js | Rémy Coutable | 2017-02-15 | 1 | -3/+0 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch 'dont-delete-assigned-issuables' into 'master' | Douwe Maan | 2017-02-15 | 3 | -4/+9 |
| | | | | | Don't delete assigned MRs/issues when user is deleted See merge request !8634 | ||||
* | Merge branch '24462-reduce_ldap_queries_for_lfs' into 'master' | Robert Speicher | 2017-02-15 | 3 | -29/+82 |
| | | | | | | | Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms Closes #24462 See merge request !8752 | ||||
* | Merge branch '27343-autocomplete-post-to-wrong-url-when-not-hosting-in-root' ↵ | Filipa Lacerda | 2017-02-15 | 5 | -11/+63 |
| | | | | | | | | | | | | into 'master' Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory Closes #27343 See merge request !8891 Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch '27516-fix-wrong-call-to-project_cache_worker-method' into ↵ | Robert Speicher | 2017-02-15 | 2 | -1/+5 |
| | | | | | | | | | | 'master' Fix wrong call to ProjectCacheWorker.perform, and call ProjectCacheWorker.perform_async instead Closes #27516 See merge request !8910 | ||||
* | Merge branch 'snippet-spam-fix' into 'master' | Rémy Coutable | 2017-02-15 | 2 | -23/+25 |
| | | | | | | | Don't render snippet actions for logged-out users Closes #27708 See merge request !8995 | ||||
* | Merge branch 'snippet-spam' into 'master' | Rémy Coutable | 2017-02-15 | 1 | -0/+4 |
| | | | | | | | Snippet spam Closes #26276 See merge request !8911 | ||||
* | Merge branch 'api-fix-files' into 'master' | Rémy Coutable | 2017-02-15 | 4 | -1/+11 |
| | | | | | API: Fix file downloading See merge request !8953 | ||||
* | Merge branch ↵ | Sean McGivern | 2017-02-15 | 2 | -3/+5 |
| | | | | | | | | | | '27267-unnecessary-queries-from-projects-dashboard-atom-and-json' into 'master' Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Closes #27267 See merge request !8956 | ||||
* | Merge branch 'fix-anchor-scrolling' into 'master' | Clement Ho | 2017-02-15 | 3 | -0/+20 |
| | | | | | | | Fix broken anchor links when special characters are used Closes #26778 See merge request !8961 | ||||
* | Merge branch 'sh-add-index-for-label-count' into 'master' | Yorick Peterse | 2017-02-15 | 2 | -1/+13 |
| | | | | | | | Add index to labels for `type` and project_id` Closes #27676 See merge request !8978 | ||||
* | Merge branch 'remove-sidekiq-backup-ar-threads' into 'master' | Douwe Maan | 2017-02-15 | 2 | -3/+5 |
| | | | | | | | Don't use backup AR connections for Sidekiq Closes #27713 See merge request !9001 | ||||
* | Merge branch '27756-fix-json-404-response' into 'master' | Clement Ho | 2017-02-15 | 4 | -5/+28 |
| | | | | | | | Fixes ajax requests when current URL has a trailing slash Closes #27756 See merge request !9010 | ||||
* | Merge branch 'fix-droplab-rendering' into 'master' | Alfredo Sumaran | 2017-02-15 | 1 | -2/+2 |
| | | | | | | | Fix droplab rendering template when data-dynamic selector is unavailable Closes gitlab-ee#1655 See merge request !9012 | ||||
* | Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into ↵ | Douwe Maan | 2017-02-15 | 5 | -13/+53 |
| | | | | | | | | | | 'master' Make deploy key not show in User's keys list Closes #27480 See merge request !9024 | ||||
* | Merge branch 'refresh-permissions-when-moving-projects' into 'master' | Rémy Coutable | 2017-02-15 | 7 | -3/+75 |
| | | | | | Refresh authorizations when transferring projects See merge request !9029 | ||||
* | Merge remote-tracking branch 'origin/8-16-stable' into 8-16-stable | Robert Speicher | 2017-02-14 | 2 | -5/+8 |
|\ | |||||
| * | Merge branch 'fix-include-description-commit-message' into '8-16-stable' | Clement Ho | 2017-02-13 | 2 | -5/+8 |
| |\ | | | | | | | | | | | | | Backport of EE - delays the initialization of MergeRequest javascrip… See merge request !9132 | ||||
| | * | Backport of EE fix in !954 - delays the initialization of MergeRequest ↵fix-include-description-commit-message | Filipa Lacerda | 2017-02-10 | 2 | -5/+8 |
| |/ | | | | | | | javascript until after DOM ready | ||||
* | | Correct duplicate 8.16.5 changelog entries | Robert Speicher | 2017-02-14 | 1 | -2/+0 |
| | | |||||
* | | Update CHANGELOG.md for 8.16.5v8.16.5 | Robert Speicher | 2017-02-14 | 1 | -0/+1 |
| | | | | | | [ci skip] | ||||
* | | Update CHANGELOG.md for 8.16.5 | Robert Speicher | 2017-02-14 | 1 | -0/+1 |
| | | | | | | [ci skip] | ||||
* | | Update VERSION to 8.16.5 | Robert Speicher | 2017-02-14 | 1 | -1/+1 |
| | | |||||
* | | Update CHANGELOG.md for 8.16.5 | Robert Speicher | 2017-02-14 | 5 | -16/+7 |
| | | | | | | [ci skip] | ||||
* | | Fix migration with missing DOWNTIME entry | Ruben Davila | 2017-02-13 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'fix-github-import-MR-wrong-project' into 'security' | Robert Speicher | 2017-02-13 | 2 | -3/+11 |
| | | | | | | | | | | Fix labels being applied to wrong merge requests on GitHub import See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2064 | ||||
* | | Merge branch 'svg-xss-fix' into 'security' | Robert Speicher | 2017-02-13 | 5 | -3/+40 |
| | | | | | | | | | | Fix for XSS vulnerability in SVG attachments See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2059 | ||||
* | | Merge branch 'fix-rdoc-xss' into 'security' | Robert Speicher | 2017-02-13 | 3 | -0/+29 |
| | | | | | | | | | | Fix XSS in rdoc and other markups See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2058 | ||||
* | | Merge branch 'asciidoctor-xss-patch' into 'security' | Robert Speicher | 2017-02-13 | 3 | -0/+30 |
|/ | | | | | Add sanitization filter to asciidocs output to prevent XSS See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2057 | ||||
* | Update VERSION to 8.16.4v8.16.4 | Robert Speicher | 2017-02-02 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 8.16.4 | Robert Speicher | 2017-02-02 | 13 | -48/+15 |
| | | | [ci skip] | ||||
* | Use `add_$role` helper in snippets specssnippet-spam-stable | Sean McGivern | 2017-02-02 | 2 | -6/+6 |
| | |||||
* | Check public snippets for spam | Sean McGivern | 2017-02-02 | 19 | -12/+277 |
| | | | | | | Apply the same spam checks to public snippets (either personal snippets that are public, or public snippets on public projects) as to issues on public projects. | ||||
* | Keep snippet visibility on error | Sean McGivern | 2017-02-02 | 7 | -11/+6 |
| | | | | | | | When a snippet is submitted, but there's an error, we didn't keep the visibility level. As the default is private, this means that submitting a public snippet that failed would then fall back to being a private snippet. |