summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Stan Hu2017-03-141-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_dataJames Edwards-Jones2017-03-141-1/+1
| | | | | | Occurred in production when an issue had an associated MR
* | Use a button and a post request instead of UJS links - part 1 - EnvironmentsFilipa Lacerda2017-03-1416-117/+247
|/
* Fix missing blob line permalink updater on blob:showfix-missing-blob-permalink-updater-on-blob-showEric Eastwood2017-03-131-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-ciAlfredo Sumaran2017-03-1335-3748/+3683
|\ | | | | | | | | Remove IIFEs for several JS files - Part 1 See merge request !9884
| * fix broken variable referenceremove-iifes-1Mike Greiling2017-03-131-1/+1
| |
| * remove IIFEs in preparation for ES module refactorMike Greiling2017-03-1335-3748/+3683
| |
* | Organize our polyfills and standardize on core-jsMike Greiling2017-03-1319-113/+72
| |
* | Merge branch 'feature/custom-lfs' into 'master' Douwe Maan2017-03-133-4/+8
|\ \ | | | | | | | | | | | | | | | | | | Do not show LFS object when LFS is disabled Closes #28817 See merge request !9779
| * | Do not show LFS object when LFS is disabledChristopher Bartz2017-03-133-4/+8
| |/ | | | | | | | | | | 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 'handle-failure-when-deleting-tags' into 'master' Douwe Maan2017-03-133-5/+23
|\ \ | | | | | | | | | | | | 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-tagsAdam Niedzielski2017-03-133-5/+23
| | |
* | | Merge branch '19742-permalink-blame-button-line-number-hash-links' into ↵Alfredo Sumaran2017-03-135-14/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-linksEric Eastwood2017-03-135-14/+52
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/19742
* | | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' Douwe Maan2017-03-1318-63/+209
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Create a new issue for a single discussion See merge request !8266
| * | | Move `ResolveDiscussions` into `concerns/issues` folderBob Van Landuyt2017-03-131-0/+0
| | | |
| * | | Check `service.discussion_to_resolve_id` to decide content of flashBob Van Landuyt2017-03-131-1/+1
| | | | | | | | | | | | | | | | That way the check is the same in the service & the controller
| * | | Update copyBob Van Landuyt2017-03-131-1/+1
| | | | | | | | | | | | | | | | One comments *on* something, not *in* something
| * | | Rename variableBob Van Landuyt2017-03-139-27/+26
| | | | | | | | | | | | | | | | | | | | merge_request_for_resolving_discussions -> merge_request_to_resolve_discussions_of
| * | | Pass the discussion to resolve after verifying captchaBob Van Landuyt2017-03-131-0/+1
| | | |
| * | | Renamed `.js.es6` to `.js`Bob Van Landuyt2017-03-131-0/+0
| | | |
| * | | Indicate that `single_discussion` is optionalBob Van Landuyt2017-03-131-1/+1
| | | |
| * | | Separate flash messages for resolving one or multiple discussionsBob Van Landuyt2017-03-131-3/+6
| | | |
| * | | Show correct message when user cannot resolve discussionsBob Van Landuyt2017-03-131-2/+5
| | | |
| * | | Replace the warning with an info iconBob Van Landuyt2017-03-131-1/+1
| | | |
| * | | Make sure the for a merge request only gets executed once.Bob Van Landuyt2017-03-131-1/+3
| | | |
| * | | Fit 'unresolved discussion widget togetherBob Van Landuyt2017-03-132-2/+4
| | | |
| * | | Add a flash messages when an issue resolving discussions is createdBob Van Landuyt2017-03-131-1/+7
| | | |
| * | | Build link to discussions to resolve in a helperBob Van Landuyt2017-03-132-3/+16
| | | |
| * | | Update copyBob Van Landuyt2017-03-131-2/+2
| | | |
| * | | Clean up `discussions_to_resolve`-methodBob Van Landuyt2017-03-131-9/+9
| | | |
| * | | Move `resolve_discussions_with_issue` to `Issues::CreateService`Bob Van Landuyt2017-03-132-9/+9
| | | |
| * | | Don't filter params and merge them back in laterBob Van Landuyt2017-03-131-7/+2
| | | | | | | | | | | | | | | | By building the issue before filtering
| * | | Correctly indent quotes in new issue descriptionBob Van Landuyt2017-03-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | By using `>`-quote style instead of `>>>`. Also: Update documentation images.
| * | | Better variable namesBob Van Landuyt2017-03-131-2/+2
| | | | | | | | | | | | | | | | So the title doesn't seem to be set _on_ a merge request.
| * | | No need to look up the notable separately in the ResolveServiceBob Van Landuyt2017-03-131-7/+1
| | | | | | | | | | | | | | | | | | | | The merge request will now always be there when the discussion was resolved by creating a new issue.
| * | | Finding discussions in NotesFinder is no longer required.Bob Van Landuyt2017-03-131-6/+0
| | | | | | | | | | | | | | | | Since the MergeRequest is now a required param for resolving discussions
| * | | Optimize finding `discussions_to_resolve`Bob Van Landuyt2017-03-131-5/+9
| | | |
| * | | Link 'discussion' instead of dateBob Van Landuyt2017-03-131-2/+1
| | | | | | | | | | | | | | | | Since the date would be wrong for people in different timezones.
| * | | Move functionality for resolving discussions into a concernBob Van Landuyt2017-03-135-39/+42
| | | |
| * | | Update copy for warning on new issue formBob Van Landuyt2017-03-131-6/+5
| | | |
| * | | Add a button to delegate all discussions in a merge requestBob Van Landuyt2017-03-133-0/+27
| | | |
| * | | Always require MR-iid for resolving discussionsBob Van Landuyt2017-03-137-70/+40
| | | | | | | | | | | | | | | | | | | | And deduplicate the finding of MR's & discussions. Now the searching is done in the service, istead of the controller & the API.
| * | | Simplify NotesFinder discussion queryBob Van Landuyt2017-03-131-1/+1
| | | |
| * | | Delegate a single discussion to a new issueBob Van Landuyt2017-03-1313-29/+160
| | | | | | | | | | | | | | | | | | | | | | | | Delegate a discussion in a merge request into a new issue. The discussion wil be marked as resolved and a system note will be added linking to the newly created issue.
* | | | Merge branch '24501-new-file-existing-branch' into 'master'Sean McGivern2017-03-1314-17/+318
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | New file from interface on existing branch Closes #24501 See merge request !8427
| * | | New file from interface on existing branchJacopo2017-03-1314-17/+318
| |/ / | | | | | | | | | | | | | | | Now you can create a new file and select a target_branch != source_branch. If the file that you want to create already exists on the target branch an error message is shown A glDropdown is used to select and create a new branch instead of a text field.
* | | Merge branch 'dz-blacklist--names' into 'master' Douwe Maan2017-03-131-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Blacklist nested groups and project names that can cause ambiguous routing for HA Closes #29324 See merge request !9898
| * | | Reserve few project and nested group pathsDmitriy Zaporozhets2017-03-131-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | That have wildcard routes associated and not reserved yet: artifacts, graphs, badges and refs Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch '27114-add-undo-to-todos-in-the-done-tab' into 'master' Sean McGivern2017-03-132-122/+127
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Add 'Undo' to Todos in the Done tab Closes #27114 See merge request !8782
View Lorry Controller Status