summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'fix/execute-inflections-initializer-early' into 'master' DJ Mountney2017-03-111-0/+0
|\
| * Execute inflections initializer earlierfix/execute-inflections-initializer-earlyDouglas Barbosa Alexandre2017-03-101-0/+0
* | Merge branch '29046-fix-github-importer-open-prs' into 'master' Douwe Maan2017-03-105-33/+105
|\ \
| * | Using guard clause and added more specs29046-fix-github-importer-open-prsGabriel Mazetto2017-03-104-58/+90
| * | ChangelogGabriel Mazetto2017-03-101-0/+4
| * | Fix GitHub Import for open PRs from a forkGabriel Mazetto2017-03-103-1/+37
| |/
* | Merge branch 'add-frequently-used-emojis-back-to-menu' into 'master' Filipa Lacerda2017-03-103-23/+61
|\ \ | |/ |/|
| * Add frequently used emojis back to awards menuadd-frequently-used-emojis-back-to-menuEric Eastwood2017-03-093-23/+61
* | Merge branch 'fix-500-in-notes-polling' into 'master' Rémy Coutable2017-03-101-1/+1
|\ \
| * | Fix notes polling failing after code changesSean McGivern2017-03-101-1/+1
* | | Merge branch '29263-merge-button-color' into 'master' 29326-how-to-vue-architectural-decisionsAnnabel Dunstone Gray2017-03-103-5/+5
|\ \ \
| * | | Consistent button colors for disabled buttons29263-merge-button-colorSimon Knox2017-03-103-5/+5
* | | | Merge branch '29137-bulk-perform-async-should-specify-queue' into 'master' Douwe Maan2017-03-103-6/+25
|\ \ \ \
| * | | | adds queue option to push bulk in authorized projects worker29137-bulk-perform-async-should-specify-queueTiago Botelho2017-03-103-6/+25
| | |_|/ | |/| |
* | | | Merge branch 'enable-snippets-by-default' into 'master' Douwe Maan2017-03-103-2/+6
|\ \ \ \
| * | | | Enable snippets for new projects by defaultenable-snippets-by-defaultSean McGivern2017-03-103-2/+6
| | |_|/ | |/| |
* | | | Merge branch 'tc-fix-project-create-500' into 'master'Douwe Maan2017-03-104-0/+22
|\ \ \ \
| * | | | Fix for creating a project through API when import_url is niltc-fix-project-create-500Toon Claes2017-03-104-0/+22
* | | | | Merge branch '28307-update-projects-edit-feature-spec' into 'master' Rémy Coutable2017-03-101-19/+11
|\ \ \ \ \
| * | | | | Update feature visibility spec for projects edit pageDavid Piegza2017-03-091-19/+11
| | |_|/ / | |/| | |
* | | | | Merge branch 'gitaly-config' into 'master' Sean McGivern2017-03-101-0/+10
|\ \ \ \ \
| * | | | | Document gitaly.socket_path settingJacob Vosmaer2017-03-101-0/+10
* | | | | | Merge branch 'adam-prevent-two-issue-trackers' into 'master' Sean McGivern2017-03-104-1/+49
|\ \ \ \ \ \