summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Finding discussions in NotesFinder is no longer required.Bob Van Landuyt2017-03-131-6/+0
| * | | Optimize finding `discussions_to_resolve`Bob Van Landuyt2017-03-131-5/+9
| * | | Link 'discussion' instead of dateBob Van Landuyt2017-03-131-2/+1
| * | | 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
| * | | Simplify NotesFinder discussion queryBob Van Landuyt2017-03-131-1/+1
| * | | Delegate a single discussion to a new issueBob Van Landuyt2017-03-1313-29/+160
* | | | Merge branch '24501-new-file-existing-branch' into 'master'Sean McGivern2017-03-1314-17/+318
|\ \ \ \ | |_|/ / |/| | |
| * | | New file from interface on existing branchJacopo2017-03-1314-17/+318
| |/ /
* | | Merge branch 'dz-blacklist--names' into 'master' Douwe Maan2017-03-131-1/+2
|\ \ \
| * | | Reserve few project and nested group pathsDmitriy Zaporozhets2017-03-131-1/+2
| | |/ | |/|
* | | 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 tabJacopo2017-03-102-122/+127
* | | Merge branch '28385-27189-tech-debt-dropdown' into 'master' Fatih Acet2017-03-131-1/+1
|\ \ \
| * | | Simplify selector28385-27189-tech-debt-dropdownFilipa Lacerda2017-03-101-1/+1
| | |/ | |/|
* | | Merge branch 'refactor/global-permissions-for-internal-users' into 'master' Sean McGivern2017-03-1311-31/+67
|\ \ \
| * | | allow internal attributes to have a nil valuerefactor/global-permissions-for-internal-usershttp://jneen.net/2017-03-101-1/+1
| * | | mark internal users in the admin panelhttp://jneen.net/2017-03-091-1/+3
| * | | get the logic right :Xhttp://jneen.net/2017-03-091-1/+1
View Lorry Controller Status