Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update VERSION to 9.2.8v9.2.8 | James Edwards-Jones | 2017-07-19 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 9.2.8 | James Edwards-Jones | 2017-07-19 | 5 | -16/+7 |
| | | | [ci skip] | ||||
* | Merge branch 'fix-changelog-entry' into 'security-9-2' | Sean McGivern | 2017-07-19 | 1 | -0/+0 |
| | | | | | Fix filename used for CHANGELOG entry See merge request !2140 | ||||
* | Merge branch '33323-fix-incorrect-project-authorizations' into 'security-9-2' | Douwe Maan | 2017-07-19 | 4 | -3/+60 |
| | | | | | Escape the underscore char inside the LIKE operator See merge request !2117 | ||||
* | Merge branch 'bvl-security-9-2-remove-appearance-symlink' into 'security-9-2' | Douwe Maan | 2017-07-19 | 5 | -2/+105 |
| | | | | | (security-9-2) Remove the `appearance` symlink that was previously missed See merge request !2125 | ||||
* | Merge branch '33303-9-2-security-fix' into 'security-9-2' | Sean McGivern | 2017-07-19 | 3 | -0/+44 |
| | | | | | [9.2 security fix] Renders 404 if given project is not readable by the user on Todos dashboard See merge request !2119 | ||||
* | Merge branch '24570-use-re2-for-user-supplied-regexp' into 'security-9-2' | Douwe Maan | 2017-07-19 | 9 | -4/+174 |
| | | | | | | Use re2 for user-supplied regexps See merge request !2029 | ||||
* | Merge branch 'issue-title-leakage-9-2' into 'security-9-2' | Robert Speicher | 2017-07-19 | 21 | -124/+93 |
| | | | | | [9.2] Improve support for external issue references See merge request !2130 | ||||
* | Update VERSION to 9.2.7v9.2.7 | Timothy Andrew | 2017-06-21 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 9.2.7 | Timothy Andrew | 2017-06-21 | 2 | -4/+4 |
| | | | [ci skip] | ||||
* | Merge branch '32653-fix-gemfile-lock' into 'master' | Grzegorz Bizon | 2017-06-21 | 1 | -4/+3 |
| | | | | | | | Fix omniauth-google-oauth2 dependencies in Gemfile.lock Closes #32653 See merge request !11787 | ||||
* | Merge branch '32861-fix-milestone-drag-and-drop-assignees' into 'master' | Phil Hughes | 2017-06-21 | 2 | -11/+23 |
| | | | | | | | Fix milestone page assignees when dropped in ongoing list Closes #32861 See merge request !12076 | ||||
* | Merge branch '33260-allow-admins-to-list-admins' into 'master' | Rémy Coutable | 2017-06-21 | 6 | -4/+53 |
| | | | | | | | Re-instate is_admin flag in users API is current user is an admin Closes #33260 See merge request !12211 | ||||
* | Update VERSION to 9.2.6v9.2.6 | Timothy Andrew | 2017-06-16 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 9.2.6 | Timothy Andrew | 2017-06-16 | 13 | -48/+15 |
| | | | [ci skip] | ||||
* | Merge branch 'patch-23' into '9-2-stable' | Sean McGivern | 2017-06-15 | 1 | -1/+2 |
|\ | | | | | | | | | Port _merge_params.html.haml conflict message See merge request !12140 | ||||
| * | Improve conflict message in _merge_params.html.haml | Luke "Jared" Bennett | 2017-06-14 | 1 | -1/+2 |
| | | |||||
| * | Port _merge_params.html.haml conflict messagepatch-23 | Luke "Jared" Bennett | 2017-06-13 | 1 | -1/+1 |
|/ | |||||
* | Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11706' ↵ | Timothy Andrew | 2017-06-13 | 5 | -6/+48 |
|\ | | | | | | | into 9-2-stable | ||||
| * | Fix merge conflicts on pipeline schedulesfix-9-2-stable-conflicts-for-mr-11706 | Z.J. van de Weg | 2017-06-13 | 2 | -10/+2 |
| | | |||||
| * | Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master' | Kamil Trzciński | 2017-06-13 | 5 | -3/+53 |
| | | | | | | | | | | | | | | | | | | | | | | Resolve "pipeline_schedules pages throwing error 500" Closes #32790 See merge request !11706 Conflicts: app/models/ci/pipeline_schedule.rb app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml | ||||
* | | Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11744' ↵ | Timothy Andrew | 2017-06-13 | 7 | -7/+123 |
|\ \ | | | | | | | | | | into 9-2-stable | ||||
| * | | Use wait_for_ajax instead of wait_for_requestsfix-9-2-stable-conflicts-for-mr-11744 | Clement Ho | 2017-06-12 | 2 | -2/+2 |
| | | | |||||
| * | | Merge branch '9-2-stable' into fix-9-2-stable-conflicts-for-mr-11744 | Clement Ho | 2017-06-12 | 109 | -280/+1049 |
| |\ \ | | |/ | |||||
| * | | Fix conflicts | Clement Ho | 2017-06-08 | 1 | -256/+32 |
| | | | |||||
| * | | Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' ↵ | Phil Hughes | 2017-06-08 | 7 | -5/+345 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Assignee dropdown does not display selected assignee Closes #2472 See merge request !11744 Conflicts: app/assets/javascripts/users_select.js | ||||
* | | | Ignore CVE-2017-5029 in Nokogiri | winh | 2017-06-13 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11700' ↵ | Timothy Andrew | 2017-06-12 | 3 | -2/+61 |
|\ \ | | | | | | | | | | into 9-2-stable | ||||
| * | | Fix up merge_reqest_tabs import/require conflictsfix-9-2-stable-conflicts-for-mr-11700 | Eric Eastwood | 2017-06-12 | 2 | -12/+17 |
| | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12011 | ||||
| * | | Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into ↵ | Clement Ho | 2017-06-12 | 2 | -2/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error thrown with missing note fragment in DOM Closes #32888 See merge request !11700 Conflicts: spec/javascripts/merge_request_tabs_spec.js | ||||
* | | | Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11964' ↵ | Timothy Andrew | 2017-06-12 | 5 | -24/+48 |
|\ \ \ | | | | | | | | | | | | | into 9-2-stable | ||||
| * | | | Merge branch ↵fix-9-2-stable-conflicts-for-mr-11964 | Adam Niedzielski | 2017-06-12 | 5 | -24/+48 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32995-issue-contents-dynamically-replaced-with-stale-version-after-saving-or-refreshing-relative-external_url-only' into 'master' Fix incorrect ETag cache key when relative instance URL is used Closes #32995 See merge request !11964 | ||||
* | | | Merge branch 'sh-recaptcha-fix-try2' into 'master' | Sean McGivern | 2017-06-12 | 3 | -1/+14 |
|/ / | | | | | | | | | | | | | Make sure reCAPTCHA configuration is loaded when spam checks are initiated Closes #33532 See merge request !12080 | ||||
* | | Merge branch 'counters_cache_invalidation' into 'master' | Rémy Coutable | 2017-06-12 | 4 | -2/+49 |
| | | | | | | | | | | Invalidate cache for issue and MR counters separately See merge request !11394 | ||||
* | | Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master' | Phil Hughes | 2017-06-12 | 2 | -1/+33 |
| | | | | | | | | | | | | | | Fix filtered search issuable empty state exception Closes #31455 See merge request !11347 | ||||
* | | Merge branch 'backport_fix_slash_commands_for_multiple_assignee' into 'master' | Douwe Maan | 2017-06-12 | 5 | -15/+27 |
| | | | | | | | | | | Backport from EE: Fix '/unassign' slash command See merge request !11926 | ||||
* | | Merge branch 'fix/backup-restore-resume' into 'master' | James Lopez | 2017-06-12 | 3 | -38/+104 |
| | | | | | | | | | | | | | | Fix backup task to continue on corrupt repositories Closes #31767 See merge request !11962 | ||||
* | | Merge branch '33377-fix-null-ref-in-repo-is-ancestor' into 'master' | Douwe Maan | 2017-06-12 | 2 | -8/+34 |
| | | | | | | | | | | | | | | nil-check Repository::is_ancestor? Closes #33377 See merge request !11976 | ||||
* | | Merge branch 'fix-9-2-stable-conflicts-for-mr-11702' into '9-2-stable' | Annabel Dunstone Gray | 2017-06-09 | 2 | -3/+8 |
|\ \ | | | | | | | | | | | | | Fix 9.2 conflicts for "Fix note header author and time ago wrapping in parallel diff" See merge request !12004 | ||||
| * | | Fix conflicts in notes.scssfix-9-2-stable-conflicts-for-mr-11702 | Eric Eastwood | 2017-06-08 | 1 | -7/+0 |
| | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11702 | ||||
| * | | Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into ↵ | Annabel Dunstone Gray | 2017-06-08 | 2 | -3/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix note header author and time ago wrapping in parallel diff Closes #32801 See merge request !11702 Conflicts: app/assets/stylesheets/pages/notes.scss | ||||
* | | | Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11793' ↵ | Timothy Andrew | 2017-06-08 | 2 | -1/+5 |
|\ \ \ | | | | | | | | | | | | | into 9-2-stable | ||||
| * | | | Fix conflict in app/assets/javascripts/blob/viewer/index.jsfix-9-2-stable-conflicts-for-mr-11793 | Sean McGivern | 2017-06-08 | 1 | -40/+1 |
| | | | | |||||
| * | | | Merge branch ↵ | Douwe Maan | 2017-06-08 | 2 | -0/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33048-markdown-rendering-of-md-files-has-ceased-to-display-latex-equations' into 'master' Fix math rendering on blob pages Closes #33048 See merge request !11793 Conflicts: app/assets/javascripts/blob/viewer/index.js | ||||
* | | | | Merge branch 'issue-boards-label-filtering' into 'master' | Filipa Lacerda | 2017-06-08 | 2 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue boards not filtering when URL params are encoded Closes #32084 See merge request !11320 | ||||
* | | | | Merge branch ↵ | Rémy Coutable | 2017-06-08 | 5 | -23/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/gb/qa/switch-to-headless-chrome-via-selenium-webdriver' into 'master' Use headless Google Chrome browser in GitLab QA Closes gitlab-qa#45 and gitlab-qa#48 See merge request !11680 | ||||
* | | | | Merge branch '32850-award-emoji-off' into 'master' | Phil Hughes | 2017-06-08 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of hover state on emoji button Closes #32850 See merge request !11691 | ||||
* | | | | Merge branch 'add-back-margin-to-note-text' into 'master' | Annabel Dunstone Gray | 2017-06-08 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Remove 0 margin bottom for last paragraph on note text See merge request !11699 | ||||
* | | | | Merge branch 'zj-drop-fk-if-exists' into 'master' | Yorick Peterse | 2017-06-08 | 2 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | Only remove FK if it exists See merge request !11828 | ||||
* | | | | Merge branch 'issue-title-fade-fix' into '9-2-stable' | Filipa Lacerda | 2017-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Fix issue realtime title/description change CSS transition See merge request !11731 |