Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move `resolve_discussions_with_issue` to `Issues::CreateService` | Bob Van Landuyt | 2017-03-13 | 2 | -9/+9 |
| | |||||
* | Don't filter params and merge them back in later | Bob Van Landuyt | 2017-03-13 | 1 | -7/+2 |
| | | | | By building the issue before filtering | ||||
* | Correctly indent quotes in new issue description | Bob Van Landuyt | 2017-03-13 | 1 | -1/+2 |
| | | | | | | By using `>`-quote style instead of `>>>`. Also: Update documentation images. | ||||
* | Better variable names | Bob Van Landuyt | 2017-03-13 | 1 | -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 ResolveService | Bob Van Landuyt | 2017-03-13 | 1 | -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 Landuyt | 2017-03-13 | 1 | -6/+0 |
| | | | | Since the MergeRequest is now a required param for resolving discussions | ||||
* | Optimize finding `discussions_to_resolve` | Bob Van Landuyt | 2017-03-13 | 1 | -5/+9 |
| | |||||
* | Link 'discussion' instead of date | Bob Van Landuyt | 2017-03-13 | 1 | -2/+1 |
| | | | | Since the date would be wrong for people in different timezones. | ||||
* | Move functionality for resolving discussions into a concern | Bob Van Landuyt | 2017-03-13 | 5 | -39/+42 |
| | |||||
* | Update copy for warning on new issue form | Bob Van Landuyt | 2017-03-13 | 1 | -6/+5 |
| | |||||
* | Add a button to delegate all discussions in a merge request | Bob Van Landuyt | 2017-03-13 | 3 | -0/+27 |
| | |||||
* | Always require MR-iid for resolving discussions | Bob Van Landuyt | 2017-03-13 | 7 | -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 query | Bob Van Landuyt | 2017-03-13 | 1 | -1/+1 |
| | |||||
* | Delegate a single discussion to a new issue | Bob Van Landuyt | 2017-03-13 | 13 | -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 Lacerda | 2017-03-10 | 1 | -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-menu | Eric Eastwood | 2017-03-09 | 1 | -18/+12 |
| | | | | | | | | Thanks @filipa for the shout` | ||||
* | | Merge branch '29263-merge-button-color' into 'master' 29326-how-to-vue-architectural-decisions | Annabel Dunstone Gray | 2017-03-10 | 2 | -5/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Consistent button colors for disabled buttons Closes #29263 and #29221 See merge request !9848 | ||||
| * | | Consistent button colors for disabled buttons29263-merge-button-color | Simon Knox | 2017-03-10 | 2 | -5/+1 |
| | | | |||||
* | | | Merge branch '29137-bulk-perform-async-should-specify-queue' into 'master' | Douwe Maan | 2017-03-10 | 1 | -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-queue | Tiago Botelho | 2017-03-10 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'adam-prevent-two-issue-trackers' into 'master' | Sean McGivern | 2017-03-10 | 2 | -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 project | Luis Del Giudice | 2017-03-10 | 2 | -1/+13 |
| | | | | |||||
* | | | | Merge branch '29316-can-t-select-a-mirror-user' into 'master' | Sean McGivern | 2017-03-10 | 1 | -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-user | Sean McGivern | 2017-03-10 | 1 | -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 Gray | 2017-03-10 | 1 | -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-name | tauriedavis | 2017-03-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch '24166-close-builds-dropdown' into 'master' | Clement Ho | 2017-03-10 | 3 | -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 Lacerda | 2017-03-09 | 2 | -4/+8 |
| | | | | | |||||
| * | | | | Use harmony syntax instead of cjs | Filipa Lacerda | 2017-03-09 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Uses vanilla JS to listen to click event | Filipa Lacerda | 2017-03-09 | 3 | -88/+85 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes `:visible` from selector Adds CHANGELOG entry Removes iife | ||||
| * | | | | Prevent dropdown from closing when user clicks in a build. | Filipa Lacerda | 2017-03-09 | 1 | -0/+16 |
| | | | | | |||||
* | | | | | Merge branch 'fix/gb/passed-with-warnings-status-on-mysql' into 'master' | Kamil Trzciński | 2017-03-10 | 2 | -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-mysql | Grzegorz Bizon | 2017-03-08 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix `passed with warnings` stage status on MySQL | Grzegorz Bizon | 2017-03-08 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | Merge branch '27899-fix-diff-view-comment-form-placement' into 'master' | Jacob Schatz | 2017-03-09 | 1 | -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-placement | Alfredo Sumaran | 2017-03-08 | 1 | -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 Sumaran | 2017-03-09 | 1 | -17/+17 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Convert data attributes in search_bar.html.haml Closes #29082 See merge request !9819 | ||||
| * | | | | Convert data attributes in search_bar.html.haml | Clement Ho | 2017-03-09 | 1 | -17/+17 |
| | | | | | |||||
* | | | | | Order milestone issues by position ascending in api | George Andrinopoulos | 2017-03-09 | 2 | -1/+3 |
|/ / / / | |||||
* | | | | Merge branch '29048-user-wrap-firefox' into 'master' | Clement Ho | 2017-03-09 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inline-block styling from dropdown avatars Closes #29048 See merge request !9840 | ||||
| * | | | | Remove inline-block styling from dropdown avatars29048-user-wrap-firefox | Annabel Dunstone Gray | 2017-03-09 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch '29014-create-issue-form-buttons-misaligned-on-mobile' into ↵ | Filipa Lacerda | 2017-03-09 | 1 | -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 mobile | TM Lee | 2017-03-09 | 1 | -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 Lacerda | 2017-03-09 | 2 | -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 Hughes | 2017-03-09 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | on lines in the changes tab | ||||
| * | | | | | | Fixed bugs with diff comment avatars | Phil Hughes | 2017-03-09 | 2 | -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 Lacerda | 2017-03-09 | 8 | -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-modules | Eric Eastwood | 2017-03-08 | 8 | -350/+360 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '28030-infinite-offset' into 'master' | Filipa Lacerda | 2017-03-09 | 2 | -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-offset | Simon Knox | 2017-03-09 | 2 | -2/+13 |
| | |_|_|/ / / | |/| | | | | |