Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [Issue sorting]Addressed review commentsfix_relative_position_calculation | Valery Sizov | 2017-03-14 | 3 | -25/+119 |
| | |||||
* | [Issue Sorting] Improve migration | Valery Sizov | 2017-03-14 | 2 | -5/+3 |
| | |||||
* | [Issue sorting] Filling positions preferable in the middle | Valery Sizov | 2017-03-14 | 2 | -24/+39 |
| | |||||
* | Added migration to reset existing relative_position for issues | Valery Sizov | 2017-03-14 | 1 | -0/+18 |
| | |||||
* | Fix relative position calculation | Valery Sizov | 2017-03-14 | 2 | -8/+39 |
| | |||||
* | Merge branch 'rs-good-changelog-bad-changelog' into 'master' | Rémy Coutable | 2017-03-14 | 1 | -24/+65 |
|\ | | | | | | | | | Expand the changelog documentation See merge request !9774 | ||||
| * | Expand the changelog documentationrs-good-changelog-bad-changelog | Robert Speicher | 2017-03-13 | 1 | -24/+65 |
| | | | | | | | | | | | | | | Adds examples of what should and should not get a changelog entry, and examples of good and bad entries. [ci skip] | ||||
* | | Merge branch 'patch-15' into 'master' | Achilleas Pipinellis | 2017-03-14 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Patch 15 Closes #29361 See merge request !9922 | ||||
| * | | Patch 15 | Xiaogang Wen | 2017-03-14 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'adam-count-badges-group-dashboard-milestones' into 'master' | Sean McGivern | 2017-03-14 | 9 | -20/+105 |
|\ \ | | | | | | | | | | | | | | | | | | | Add count badges to both dashboard and group milestones Closes #24421 See merge request !9836 | ||||
| * | | Add count badges to both dashboard and group milestonesadam-count-badges-group-dashboard-milestones | Alex Braha Stoll | 2017-03-10 | 9 | -20/+105 |
| | | | |||||
* | | | Merge branch 'lm-docs-clarity' into 'master' | Achilleas Pipinellis | 2017-03-14 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Update markdown.md example with asterisks and underscores for clarity See merge request !9915 | ||||
| * | | | Update markdown.md example with asterisks and underscores for claritylm-docs-clarity | Lee Matos | 2017-03-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'patch-15' into 'master' | Achilleas Pipinellis | 2017-03-14 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix miswording See merge request !9832 | ||||
| * | | | | Fix miswording | Adrian Sadłocha | 2017-03-09 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch ↵ | Stan Hu | 2017-03-14 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28743-actionview-template-error-execjs-disabled-_issuable_meta_data' into 'master' Fix 'ExecJS disabled' error on issues index Closes #28743 See merge request !9916 | ||||
| * | | | | | Fix 'ExecJS disabled' error on issues index 28743-actionview-template-error-execjs-disabled-_issuable_meta_data | James Edwards-Jones | 2017-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Occurred in production when an issue had an associated MR | ||||
* | | | | | | Merge branch 'fix/regression-in-runners-registration-v1-api' into 'master' | Rémy Coutable | 2017-03-14 | 3 | -2/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix regression in runners registration v1 api See merge request !9904 | ||||
| * | | | | | | Fix regression in runners registration v1 apifix/regression-in-runners-registration-v1-api | Tomasz Maczukin | 2017-03-13 | 3 | -2/+8 |
| | | | | | | | |||||
* | | | | | | | Merge branch '20450-fix-ujs-actions' into 'master' | Alfredo Sumaran | 2017-03-14 | 28 | -199/+375 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Use a button and a post request instead of UJS links - part 1 - Environments See merge request !9688 | ||||
| * | | | | | | Use a button and a post request instead of UJS links - part 1 - Environments | Filipa Lacerda | 2017-03-14 | 28 | -199/+375 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'fix-missing-blob-permalink-updater-on-blob-show' into 'master' | Alfredo Sumaran | 2017-03-14 | 1 | -23/+21 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Fix missing blob line permalink updater on blob:show See merge request !9914 | ||||
| * | | | | | Fix missing blob line permalink updater on blob:showfix-missing-blob-permalink-updater-on-blob-show | Eric Eastwood | 2017-03-13 | 1 | -23/+21 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9461#note_25288831 | ||||
* | | | | | Merge branch 'remove-iifes-1' into 'master' 29399-add-documentation-workflow-to-ci | Alfredo Sumaran | 2017-03-13 | 35 | -3748/+3683 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove IIFEs for several JS files - Part 1 See merge request !9884 | ||||
| * | | | | | fix broken variable referenceremove-iifes-1 | Mike Greiling | 2017-03-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | remove IIFEs in preparation for ES module refactor | Mike Greiling | 2017-03-13 | 35 | -3748/+3683 |
| | | | | | | |||||
* | | | | | | Merge branch 'use-corejs-polyfills' into 'master' | Alfredo Sumaran | 2017-03-13 | 37 | -238/+125 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Organize our polyfills and standardize on core-js See merge request !9749 | ||||
| * | | | | | | Organize our polyfills and standardize on core-js | Mike Greiling | 2017-03-13 | 37 | -238/+125 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'feature/custom-lfs' into 'master' | Douwe Maan | 2017-03-13 | 8 | -34/+83 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show LFS object when LFS is disabled Closes #28817 See merge request !9779 | ||||
| * | | | | | | Do not show LFS object when LFS is disabled | Christopher Bartz | 2017-03-13 | 8 | -34/+83 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not display a 404, when a user tries to retrieve the raw content of an LFS file (pointer) if the config option "lfs_enabled" is set to false. Instead, display the LFS pointer file directly. | ||||
* | | | | | | Merge branch ↵ | Robert Speicher | 2017-03-13 | 4 | -1/+35 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28492-add-dev-documentation-for-using-the-queryrecorder-in-specs' into 'master' Adds docs for QueryRecorder tests Closes #28492 See merge request !9838 | ||||
| * | | | | | | Adds docs for QueryRecorder tests28492-add-dev-documentation-for-using-the-queryrecorder-in-specs | James Edwards-Jones | 2017-03-13 | 4 | -1/+35 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'handle-failure-when-deleting-tags' into 'master' | Douwe Maan | 2017-03-13 | 5 | -11/+48 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display error message when deleting tag in web UI fails See merge request !9906 | ||||
| * | | | | | | | Display error message when deleting tag in web UI failshandle-failure-when-deleting-tags | Adam Niedzielski | 2017-03-13 | 5 | -11/+48 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '19742-permalink-blame-button-line-number-hash-links' into ↵ | Alfredo Sumaran | 2017-03-13 | 8 | -28/+157 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update permalink/blame buttons with line number fragment hash Closes #19742 See merge request !9461 | ||||
| * | | | | | | | | Update permalink/blame buttons with line number fragment hash19742-permalink-blame-button-line-number-hash-links | Eric Eastwood | 2017-03-13 | 8 | -28/+157 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/19742 | ||||
* | | | | | | | | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' | Douwe Maan | 2017-03-13 | 41 | -206/+759 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new issue for a single discussion See merge request !8266 | ||||
| * | | | | | | | | | Don't instrument `app/services/concerns` | Bob Van Landuyt | 2017-03-13 | 1 | -7/+11 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Make API v3 work with the new param name | Bob Van Landuyt | 2017-03-13 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Move `ResolveDiscussions` into `concerns/issues` folder | Bob Van Landuyt | 2017-03-13 | 2 | -1/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Check `service.discussion_to_resolve_id` to decide content of flash | Bob Van Landuyt | 2017-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way the check is the same in the service & the controller | ||||
| * | | | | | | | | | Update copy | Bob Van Landuyt | 2017-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One comments *on* something, not *in* something | ||||
| * | | | | | | | | | Rename variable | Bob Van Landuyt | 2017-03-13 | 19 | -65/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_request_for_resolving_discussions -> merge_request_to_resolve_discussions_of | ||||
| * | | | | | | | | | Pass the discussion to resolve after verifying captcha | Bob Van Landuyt | 2017-03-13 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Renamed `.js.es6` to `.js` | Bob Van Landuyt | 2017-03-13 | 1 | -0/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Indicate that `single_discussion` is optional | Bob Van Landuyt | 2017-03-13 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Separate flash messages for resolving one or multiple discussions | Bob Van Landuyt | 2017-03-13 | 2 | -15/+18 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Show correct message when user cannot resolve discussions | Bob Van Landuyt | 2017-03-13 | 3 | -79/+114 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Replace the warning with an info icon | Bob Van Landuyt | 2017-03-13 | 3 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Make sure the for a merge request only gets executed once. | Bob Van Landuyt | 2017-03-13 | 2 | -1/+22 |
| | | | | | | | | | |