summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix 'ExecJS disabled' error on issues index 28743-actionview-template-error-execjs-disabled-_issuable_meta_dataJames Edwards-Jones2017-03-141-1/+1
* Merge branch 'fix-missing-blob-permalink-updater-on-blob-show' into 'master' Alfredo Sumaran2017-03-141-23/+21
|\
| * Fix missing blob line permalink updater on blob:showfix-missing-blob-permalink-updater-on-blob-showEric Eastwood2017-03-131-23/+21
|/
* Merge branch 'remove-iifes-1' into 'master' 29399-add-documentation-workflow-to-ciAlfredo Sumaran2017-03-1335-3748/+3683
|\
| * fix broken variable referenceremove-iifes-1Mike Greiling2017-03-131-1/+1
| * remove IIFEs in preparation for ES module refactorMike Greiling2017-03-1335-3748/+3683
* | Merge branch 'use-corejs-polyfills' into 'master' Alfredo Sumaran2017-03-1337-238/+125
|\ \
| * | Organize our polyfills and standardize on core-jsMike Greiling2017-03-1337-238/+125
|/ /
* | Merge branch 'feature/custom-lfs' into 'master' Douwe Maan2017-03-138-34/+83
|\ \
| * | Do not show LFS object when LFS is disabledChristopher Bartz2017-03-138-34/+83
| |/
* | Merge branch '28492-add-dev-documentation-for-using-the-queryrecorder-in-spec...Robert Speicher2017-03-134-1/+35
|\ \
| * | Adds docs for QueryRecorder tests28492-add-dev-documentation-for-using-the-queryrecorder-in-specsJames Edwards-Jones2017-03-134-1/+35
* | | Merge branch 'handle-failure-when-deleting-tags' into 'master' Douwe Maan2017-03-135-11/+48
|\ \ \
| * | | Display error message when deleting tag in web UI failshandle-failure-when-deleting-tagsAdam Niedzielski2017-03-135-11/+48
* | | | Merge branch '19742-permalink-blame-button-line-number-hash-links' into 'mast...Alfredo Sumaran2017-03-138-28/+157
|\ \ \ \
| * | | | Update permalink/blame buttons with line number fragment hash19742-permalink-blame-button-line-number-hash-linksEric Eastwood2017-03-138-28/+157
* | | | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' Douwe Maan2017-03-1341-206/+759
|\ \ \ \ \
| * | | | | Don't instrument `app/services/concerns`Bob Van Landuyt2017-03-131-7/+11
| * | | | | Make API v3 work with the new param nameBob Van Landuyt2017-03-131-0/+1
| * | | | | Move `ResolveDiscussions` into `concerns/issues` folderBob Van Landuyt2017-03-132-1/+2
| * | | | | Check `service.discussion_to_resolve_id` to decide content of flashBob Van Landuyt2017-03-131-1/+1
| * | | | | Update copyBob Van Landuyt2017-03-131-1/+1
| * | | | | Rename variableBob Van Landuyt2017-03-1319-65/+64
| * | | | | 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-132-15/+18
| * | | | | Show correct message when user cannot resolve discussionsBob Van Landuyt2017-03-133-79/+114
| * | | | | Replace the warning with an info iconBob Van Landuyt2017-03-133-1/+1
| * | | | | Make sure the for a merge request only gets executed once.Bob Van Landuyt2017-03-132-1/+22
| * | | | | 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-133-1/+31
| * | | | | Build link to discussions to resolve in a helperBob Van Landuyt2017-03-133-3/+48
| * | | | | 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
| * | | | | Correctly indent quotes in new issue descriptionBob Van Landuyt2017-03-134-5/+6
| * | | | | Better variable namesBob Van Landuyt2017-03-131-2/+2
| * | | | | No need to look up the notable separately in the ResolveServiceBob Van Landuyt2017-03-132-8/+2
| * | | | | Finding discussions in NotesFinder is no longer required.Bob Van Landuyt2017-03-132-17/+0
| * | | | | Optimize finding `discussions_to_resolve`Bob Van Landuyt2017-03-131-5/+9
| * | | | | Link 'discussion' instead of dateBob Van Landuyt2017-03-131-2/+1
| * | | | | Make API v3 compatible with the changes in `Issues::CreateService`Bob Van Landuyt2017-03-131-6/+0
| * | | | | Move functionality for resolving discussions into a concernBob Van Landuyt2017-03-136-42/+54
| * | | | | 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-136-24/+82
| * | | | | Always require MR-iid for resolving discussionsBob Van Landuyt2017-03-1317-187/+101
| * | | | | Simplify NotesFinder discussion queryBob Van Landuyt2017-03-131-1/+1
| * | | | | Delegate a single discussion to a new issueBob Van Landuyt2017-03-1331-113/+571
View Lorry Controller Status