summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | By building the issue before filtering
* Correctly indent quotes in new issue descriptionBob Van Landuyt2017-03-131-1/+2
| | | | | | By using `>`-quote style instead of `>>>`. Also: Update documentation images.
* Better variable namesBob Van Landuyt2017-03-131-2/+2
| | | | So the title doesn't seem to be set _on_ a merge request.
* No need to look up the notable separately in the ResolveServiceBob Van Landuyt2017-03-131-7/+1
| | | | | The merge request will now always be there when the discussion was resolved by creating a new issue.
* Finding discussions in NotesFinder is no longer required.Bob Van Landuyt2017-03-131-6/+0
| | | | Since the MergeRequest is now a required param for resolving discussions
* Optimize finding `discussions_to_resolve`Bob Van Landuyt2017-03-131-5/+9
|
* Link 'discussion' instead of dateBob Van Landuyt2017-03-131-2/+1
| | | | Since the date would be wrong for people in different timezones.
* 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
| | | | | And deduplicate the finding of MR's & discussions. Now the searching is done in the service, istead of the controller & the API.
* Simplify NotesFinder discussion queryBob Van Landuyt2017-03-131-1/+1
|
* Delegate a single discussion to a new issueBob Van Landuyt2017-03-1313-29/+160
| | | | | | Delegate a discussion in a merge request into a new issue. The discussion wil be marked as resolved and a system note will be added linking to the newly created issue.
* Merge branch 'add-frequently-used-emojis-back-to-menu' into 'master' Filipa Lacerda2017-03-101-18/+12
|\ | | | | | | | | Add frequently used emojis back to awards menu See merge request !9843
| * Add frequently used emojis back to awards menuadd-frequently-used-emojis-back-to-menuEric Eastwood2017-03-091-18/+12
| | | | | | | | Thanks @filipa for the shout`
* | Merge branch '29263-merge-button-color' into 'master' 29326-how-to-vue-architectural-decisionsAnnabel Dunstone Gray2017-03-102-5/+1
|\ \ | | | | | | | | | | | | | | | | | | Consistent button colors for disabled buttons Closes #29263 and #29221 See merge request !9848
| * | Consistent button colors for disabled buttons29263-merge-button-colorSimon Knox2017-03-102-5/+1
| | |
* | | Merge branch '29137-bulk-perform-async-should-specify-queue' into 'master' Douwe Maan2017-03-101-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | adds queue option to push bulk in authorized projects worker Closes #29137 See merge request !9813
| * | | adds queue option to push bulk in authorized projects worker29137-bulk-perform-async-should-specify-queueTiago Botelho2017-03-101-1/+1
| | |/ | |/|
* | | Merge branch 'adam-prevent-two-issue-trackers' into 'master' Sean McGivern2017-03-102-1/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prevent more than one issue tracker to be active for the same project Closes #22797 See merge request !9669
| * | | Prevent more than one issue tracker to be active for the same projectLuis Del Giudice2017-03-102-1/+13
| | | |
* | | | Merge branch '29316-can-t-select-a-mirror-user' into 'master' Sean McGivern2017-03-101-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve "Can't select a mirror user" See merge request !9854
| * | | | Fix autocomplete in EE when permissions are sent29316-can-t-select-a-mirror-userSean McGivern2017-03-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In EE, `@users` can be an array at the point where we remove the current user, because it can do a permissions check on the users for project mirroring. Fix this in CE by only using array methods, not AR methods. We can't use `delete` because that uses `Object#equal?`, which isn't true in this case.
* | | | | Merge branch '29209-sign-up-form-name' into 'master' Annabel Dunstone Gray2017-03-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Change label for name on sign up form Closes #29209 See merge request !9845
| * | | | Change label for name on sign up form29209-sign-up-form-nametauriedavis2017-03-091-1/+1
| | | | |
* | | | | Merge branch '24166-close-builds-dropdown' into 'master' Clement Ho2017-03-103-73/+90
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Prevent dropdown from closing when user clicks in a build. Closes #24166 See merge request !9834
| * | | | Target all build links inside a dropdown. Use jQuery to handle event delegation.Filipa Lacerda2017-03-092-4/+8
| | | | |
| * | | | Use harmony syntax instead of cjsFilipa Lacerda2017-03-091-2/+2
| | | | |
| * | | | Uses vanilla JS to listen to click eventFilipa Lacerda2017-03-093-88/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes `:visible` from selector Adds CHANGELOG entry Removes iife
| * | | | Prevent dropdown from closing when user clicks in a build.Filipa Lacerda2017-03-091-0/+16
| | | | |
* | | | | Merge branch 'fix/gb/passed-with-warnings-status-on-mysql' into 'master' Kamil Trzciński2017-03-102-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix "passed with warnings" stage status on MySQL Closes #28603 See merge request !9802
| * | | | Fix Rubocop offense in CI/CD stage codefix/gb/passed-with-warnings-status-on-mysqlGrzegorz Bizon2017-03-081-1/+1
| | | | |
| * | | | Fix `passed with warnings` stage status on MySQLGrzegorz Bizon2017-03-082-4/+4
| | | | |
* | | | | Merge branch '27899-fix-diff-view-comment-form-placement' into 'master'Jacob Schatz2017-03-091-2/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Get view type based on diff_view Cookie Closes #27899 See merge request !9821
| * | | | Get view type based on diff_view Cookie27899-fix-diff-view-comment-form-placementAlfredo Sumaran2017-03-081-2/+8
| | | | | | | | | | | | | | | | | | | | This is because we need to persist the same view type across tabs
* | | | | Merge branch 'convert-data-attr-search-bar' into 'master' Alfredo Sumaran2017-03-091-17/+17
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Convert data attributes in search_bar.html.haml Closes #29082 See merge request !9819
| * | | | Convert data attributes in search_bar.html.hamlClement Ho2017-03-091-17/+17
| | | | |
* | | | | Order milestone issues by position ascending in apiGeorge Andrinopoulos2017-03-092-1/+3
|/ / / /
* | | | Merge branch '29048-user-wrap-firefox' into 'master' Clement Ho2017-03-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inline-block styling from dropdown avatars Closes #29048 See merge request !9840
| * | | | Remove inline-block styling from dropdown avatars29048-user-wrap-firefoxAnnabel Dunstone Gray2017-03-091-2/+2
| | | | |
* | | | | Merge branch '29014-create-issue-form-buttons-misaligned-on-mobile' into ↵Filipa Lacerda2017-03-091-13/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [#29014] Create issue form buttons are misaligned on mobile Closes #29014 See merge request !9706
| * | | | | [#29014] Create issue form buttons are misaligned on mobileTM Lee2017-03-091-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Ensure Save/Create button is aligned with Cancel - Move the cancel button above but float to the right using pull-right - Allows responsive css to flow
* | | | | | Merge branch 'diff-avatar-improvements' into 'master' Filipa Lacerda2017-03-092-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff avatar improvements Closes #29237, #29238, and #29243 See merge request !9829
| * | | | | | Check was in wrong part, the avatar container class should always be added ↵Phil Hughes2017-03-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | on lines in the changes tab
| * | | | | | Fixed bugs with diff comment avatarsPhil Hughes2017-03-092-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment button on commit view was way out to the left side because the element that renders the diff avatars was rendering when it shouldnt be When commenting on a discussion on the discussions tab it would try to render the avatar & in some cases work correctly even though it shouldnt be possible for this to happen. Changed the if statement to take this into account Closes #29237, #29238, #29243
* | | | | | | Merge branch 'update-native-unicode-emojis-with-harmony-modules' into 'master' Filipa Lacerda2017-03-098-350/+360
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update emojis to use harmony modules (import/export) See merge request !9784
| * | | | | | | Update emojis to use harmony modules (import/export)update-native-unicode-emojis-with-harmony-modulesEric Eastwood2017-03-088-350/+360
| | | | | | | |
* | | | | | | | Merge branch '28030-infinite-offset' into 'master' Filipa Lacerda2017-03-092-2/+13
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | respect offset and limit query params for infinite lists Closes #28030 See merge request !9540
| * | | | | | | respect offset and limit query params for infinite lists28030-infinite-offsetSimon Knox2017-03-092-2/+13
| | |_|_|/ / / | |/| | | | |
View Lorry Controller Status