summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix_relative_position_calculation' into 'master' Douwe Maan2017-03-141-26/+64
|\
| * [Issue sorting]Addressed review commentsfix_relative_position_calculationValery Sizov2017-03-141-23/+54
| * [Issue sorting] Filling positions preferable in the middleValery Sizov2017-03-141-10/+13
| * Fix relative position calculationValery Sizov2017-03-141-8/+12
* | Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master' Sean McGivern2017-03-144-9/+9
|\ \
| * | Update API on frontend to use v428864-use-the-v4-api-from-the-frontendSam Rose2017-03-144-9/+9
| |/
* | Merge branch '29389-fix-already-initialized-constants' into 'master' Robert Speicher2017-03-141-2/+0
|\ \
| * | Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constantsRémy Coutable2017-03-131-2/+0
* | | Merge branch 'nonewline-parser' into 'master' Sean McGivern2017-03-142-3/+3
|\ \ \
| * | | take nonewline context into account in diff parsermhasbini2017-03-132-3/+3
* | | | Merge branch 'fix/gb/dashboard-commit-status-caching' into 'master' Sean McGivern2017-03-141-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Improve fragment caching rules at projects dashboardGrzegorz Bizon2017-03-131-1/+1
* | | | Merge branch 'adam-count-badges-group-dashboard-milestones' into 'master' Sean McGivern2017-03-147-20/+38
|\ \ \ \
| * | | | Add count badges to both dashboard and group milestonesadam-count-badges-group-dashboard-milestonesAlex Braha Stoll2017-03-107-20/+38
* | | | | Merge branch '28743-actionview-template-error-execjs-disabled-_issuable_meta_...Stan Hu2017-03-141-1/+1
|\ \ \ \ \
| * | | | | Fix 'ExecJS disabled' error on issues index 28743-actionview-template-error-execjs-disabled-_issuable_meta_dataJames Edwards-Jones2017-03-141-1/+1
* | | | | | 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
* | | | | 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
* | | | | | 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 disabledChristopher Bartz2017-03-133-4/+8
| |/ / / / /
* | | | | | Merge branch 'handle-failure-when-deleting-tags' into 'master' Douwe Maan2017-03-133-5/+23
|\ \ \ \ \ \
| * | | | | | 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 'mast...Alfredo Sumaran2017-03-135-14/+52
|\ \ \ \ \ \
| * | | | | | Update permalink/blame buttons with line number fragment hash19742-permalink-blame-button-line-number-hash-linksEric Eastwood2017-03-135-14/+52
* | | | | | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' Douwe Maan2017-03-1318-63/+209
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | 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
| * | | | | | Update copyBob Van Landuyt2017-03-131-1/+1
| * | | | | | Rename variableBob Van Landuyt2017-03-139-27/+26
| * | | | | | 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
| * | | | | | Correctly indent quotes in new issue descriptionBob Van Landuyt2017-03-131-1/+2
| * | | | | | Better variable namesBob Van Landuyt2017-03-131-2/+2
| * | | | | | No need to look up the notable separately in the ResolveServiceBob Van Landuyt2017-03-131-7/+1
View Lorry Controller Status