Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fixed MR single button submit failure and attempted to tidy up close_reopen ↵ | Luke "Jared" Bennett | 2017-07-07 | 2 | -10/+20 | |
| | | | | partials using issuable_helpers and setDisable will use true as default bool | |||||
* | Revert parent param removal | Luke "Jared" Bennett | 2017-07-07 | 2 | -5/+5 | |
| | ||||||
* | Dont show toggle if only one action is available and do not show report as ↵ | Luke "Jared" Bennett | 2017-07-07 | 2 | -12/+19 | |
| | | | | abuse for current_user's issuables | |||||
* | Removed merge_request/issue state_event param parent and removed ↵ | Luke "Jared" Bennett | 2017-07-07 | 1 | -3/+3 | |
| | | | | issuable_path helpers in favour of issuable_url helpers | |||||
* | Added specs | Luke "Jared" Bennett | 2017-07-07 | 1 | -1/+1 | |
| | ||||||
* | First FE review changes | Luke "Jared" Bennett | 2017-07-07 | 1 | -8/+8 | |
| | ||||||
* | Added report issuable feature | Luke "Jared" Bennett | 2017-07-07 | 3 | -1/+49 | |
| | ||||||
* | Create and use project path helpers that only need a project, no namespace | Douwe Maan | 2017-07-05 | 4 | -7/+7 | |
| | ||||||
* | Merge branch 'tc-namespace-license-checks--multiple-assignees' into 'master' | Douwe Maan | 2017-07-04 | 3 | -6/+7 | |
|\ | | | | | | | | | CE counterpart of: Namespace license checks for multiple assignees See merge request !11825 | |||||
| * | Use helper method to set filtered search input attributes | Toon Claes | 2017-06-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | The list of attributes for the filtered search input was getting long, so use a helper method to fill that hash. Also, for multiple issue assignees, a helper is more convenient because it would allow EE to override the behavior if MIA is supported. | |||||
| * | Use FormHelper#issue_assignees_dropdown_options for Issue sidebar | Toon Claes | 2017-06-20 | 1 | -4/+5 | |
| | | | | | | | | | | | | Avoid code duplication and limit the number of CE -> EE merge conflict by reusing `FormHelper#issue_assignees_dropdown_options` to set some assignee dropdown attributes. | |||||
| * | FormHelper#issue_assignees_dropdown_options never has multiple assignees | Toon Claes | 2017-06-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | Only EE supports multiple issue assignees, so this CE code should not contain code to have multiple assignees. EE will override the multiple issue assignees feature by overriding this method. | |||||
* | | Set force_remove_source_branch default to false.32885-unintentionally-removing-branch-when-merging-merge-request | Bryce Johnson | 2017-07-02 | 1 | -2/+1 | |
| | | ||||||
* | | Polish sidebar toggle | Clement Ho | 2017-06-27 | 2 | -3/+6 | |
| | | ||||||
* | | Add feature spec for dashboard state filter tabs33833-issue-and-mr-state-tabs-don-t-work-on-dashboard | Eric Eastwood | 2017-06-21 | 1 | -1/+1 | |
| | | ||||||
* | | Revert to using links instead of buttons in Issuable Index tabs. | Bryce Johnson | 2017-06-21 | 1 | -9/+10 | |
| | | ||||||
* | | Bulk edit scroll fix | Bryce Johnson | 2017-06-21 | 1 | -1/+1 | |
|/ | ||||||
* | Improve conflict message in _merge_params.html.haml | Luke "Jared" Bennett | 2017-06-14 | 1 | -1/+2 | |
| | ||||||
* | Backport merge_params.html.haml conflict comment | Luke "Jared" Bennett | 2017-06-14 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'auto-search-when-state-changed' into 'master' | Phil Hughes | 2017-06-07 | 1 | -10/+9 | |
|\ | | | | | | | | | | | | | Perform filtered search when state tab is changed Closes #27261 See merge request !11917 | |||||
| * | Use data attributes instead of class | Clement Ho | 2017-06-07 | 1 | -4/+4 | |
| | | ||||||
| * | Merge branch 'master' into auto-search-when-state-changed | Clement Ho | 2017-06-06 | 4 | -83/+61 | |
| |\ | ||||||
| * | | Use button instead of fake button | Clement Ho | 2017-06-06 | 1 | -4/+4 | |
| | | | ||||||
| * | | Fix haml lint | Clement Ho | 2017-06-05 | 1 | -4/+4 | |
| | | | ||||||
| * | | Perform filtered search when state tab is changed | Clement Ho | 2017-06-05 | 1 | -10/+9 | |
| | | | ||||||
* | | | Merge branch '12910-snippets-description' into 'master' | Phil Hughes | 2017-06-07 | 2 | -23/+1 | |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Support descriptions for snippets Closes #31894 See merge request !11071 | |||||
| * | | Support descriptions for snippets | Jarka Kadlecova | 2017-05-31 | 2 | -23/+1 | |
| | | | ||||||
* | | | Move issuable bulk edit form into a new sidebar.28340-mass-edit-issues-and-mrs-from-sidebar | Bryce Johnson | 2017-06-06 | 4 | -83/+61 | |
| |/ |/| | ||||||
* | | Move clear search button out of issuable search bar | winh | 2017-06-02 | 1 | -2/+2 | |
| | | ||||||
* | | Show current user immediately in issuable filters | Winnie Hellmann | 2017-06-02 | 2 | -16/+24 | |
|/ | ||||||
* | Merge branch 'back-port-locked-milestones-to-ce' into 'master' | Phil Hughes | 2017-05-30 | 1 | -1/+2 | |
|\ | | | | | | | | | | | | | `canEdit` changes for conditional remove button on filtered search -- EE backport Closes gitlab-ee#2433 See merge request !11696 | |||||
| * | Backport canEdit changes for conditional remove buttonback-port-locked-milestones-to-ce | Eric Eastwood | 2017-05-26 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Backport Fix locked milestone in boards being remove-able. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1963 Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2433 Conflicts: app/assets/javascripts/boards/boards_bundle.js app/assets/javascripts/boards/filtered_search_boards.js app/assets/javascripts/filtered_search/filtered_search_manager.js spec/features/boards/boards_spec.rb | |||||
* | | Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' ↵ | Phil Hughes | 2017-05-30 | 2 | -2/+2 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Assignee dropdown does not display selected assignee Closes #2472 See merge request !11744 | |||||
| * | | Backport MR from EE | Clement Ho | 2017-05-26 | 2 | -2/+2 | |
| | | | ||||||
* | | | Merge branch ↵ | Fatih Acet | 2017-05-26 | 1 | -0/+10 | |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master' Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form Closes #32447 and #32907 See merge request !11558 | |||||
| * | | Upgrade Remove Source Branch checkbox UX. | Bryce Johnson | 2017-05-22 | 1 | -0/+10 | |
| | | | ||||||
* | | | Fixed create new label form in issue form not working for sub-group projectsissuable-form-create-label-sub-groups | Phil Hughes | 2017-05-25 | 1 | -1/+1 | |
| |/ |/| | | | | | Closes #32906 | |||||
* | | Merge branch '32170-assignees-spinner' into 'master' | Phil Hughes | 2017-05-24 | 1 | -0/+3 | |
|\ \ | | | | | | | | | | | | | | | | | | | show loading indicator while waiting for assignees first fetch Closes #32170 See merge request !11434 | |||||
| * | | add loading spinner to sidebar assignees32170-assignees-spinner | Simon Knox | 2017-05-24 | 1 | -0/+3 | |
| |/ | | | | | | | store isFetching state to indicate if assignees has initial data | |||||
* | | Merge branch ↵ | Phil Hughes | 2017-05-24 | 1 | -4/+4 | |
|\ \ | |/ |/| | | | | | | | | | | | | | '32563-remove-duplicated-config-code-for-filtered-search-dropdowns' into 'master' Resolve "Remove duplicated config code for filtered search dropdowns" Closes #32563 See merge request !11512 | |||||
| * | Remove duplicated code | Clement Ho | 2017-05-18 | 1 | -4/+4 | |
| | | ||||||
* | | Stop loading MergeRequestEntity data on sidebar request | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+1 | |
|/ | ||||||
* | Convert fa-history to svg; tweak alignment | Annabel Dunstone Gray | 2017-05-17 | 1 | -1/+1 | |
| | ||||||
* | Merge branch '31902-namespace-recent-searches-to-project' into 'master' | Annabel Dunstone Gray | 2017-05-15 | 1 | -1/+1 | |
|\ | | | | | | | | | | | | | Scope recent searches to project Closes #31902 See merge request !11142 | |||||
| * | Scope recent searches to project | Eric Eastwood | 2017-05-15 | 1 | -1/+1 | |
| | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31902 | |||||
* | | Merge branch '30975-fixed-top-nav-POC' into 'master' | Annabel Dunstone Gray | 2017-05-12 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | | | | | | | | | | Add fixed positioning to top level navbar Closes #30975 See merge request !10751 | |||||
| * | | Fade out border on scroll | Annabel Dunstone Gray | 2017-05-12 | 1 | -0/+1 | |
| | | | ||||||
| * | | Add fixed positioning to top level navbar | Annabel Dunstone Gray | 2017-05-12 | 1 | -2/+1 | |
| | | | ||||||
* | | | Consistently use monospace font for commit SHAs and branch and tag names | Douwe Maan | 2017-05-12 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge branch 'fixes_for_multiple_issue_assignees' into 'master' | Sean McGivern | 2017-05-12 | 3 | -18/+18 | |
|\ \ | | | | | | | | | | | | | | | | | | | Fix for Follow-up from "Backport of Multiple Assignees feature Closes #31888 See merge request !11178 |