summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '20450-fix-ujs-actions-part-3-step2' into 20450-fix-ujs-actions-...20450-fix-ujs-actions-part-3-step3Filipa Lacerda2017-03-15322-4820/+8847
|\
| * Merge branch 'fl-remove-ujs-pipelines' into 20450-fix-ujs-actions-part-3-step220450-fix-ujs-actions-part-3-step2Filipa Lacerda2017-03-14327-4876/+8885
| |\
| | * Merge branch 'cherry-pick-7eedeb49' into 'fl-remove-ujs-pipelines' Filipa Lacerda2017-03-146-64/+189
| | |\
| | | * Merge branch '20450-fix-ujs-actions-part-3-step1' into '20450-fix-ujs-actions...Alfredo Sumaran2017-03-146-64/+189
| | |/
| | * Merge branch 'patch-15' into 'master' Achilleas Pipinellis2017-03-141-1/+1
| | |\
| | | * Patch 15Xiaogang Wen2017-03-141-1/+1
| | |/
| | * Merge branch 'adam-count-badges-group-dashboard-milestones' into 'master' Sean McGivern2017-03-149-20/+105
| | |\
| | | * Add count badges to both dashboard and group milestonesadam-count-badges-group-dashboard-milestonesAlex Braha Stoll2017-03-109-20/+105
| | * | Merge branch 'lm-docs-clarity' into 'master' Achilleas Pipinellis2017-03-141-1/+1
| | |\ \
| | | * | Update markdown.md example with asterisks and underscores for claritylm-docs-clarityLee Matos2017-03-131-1/+1
| | * | | Merge branch 'patch-15' into 'master' Achilleas Pipinellis2017-03-141-2/+2
| | |\ \ \
| | | * | | Fix miswordingAdrian Sadłocha2017-03-091-2/+2
| | * | | | 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
| | * | | | | Merge branch 'fix/regression-in-runners-registration-v1-api' into 'master' Rémy Coutable2017-03-143-2/+8
| | |\ \ \ \ \
| | | * | | | | Fix regression in runners registration v1 apifix/regression-in-runners-registration-v1-apiTomasz Maczukin2017-03-133-2/+8
| | * | | | | | Merge branch '20450-fix-ujs-actions' into 'master' Alfredo Sumaran2017-03-1428-199/+375
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Use a button and a post request instead of UJS links - part 1 - EnvironmentsFilipa Lacerda2017-03-1428-199/+375
| | |/ / / / /
| | * | | | | 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
View Lorry Controller Status