Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed eslintboards-blank-state-template-in-js | Phil Hughes | 2017-03-16 | 1 | -6/+7 |
| | |||||
* | Catches errors when generating lists | Phil Hughes | 2017-03-16 | 1 | -0/+92 |
| | |||||
* | Display full project name with namespace upon deletion | Mark Fletcher | 2017-03-15 | 1 | -2/+2 |
| | | | | * Removes ambiguity when two projects exist with the same name | ||||
* | Merge branch '28187-project-name-cut-off-with-nested-groups' into 'master' | Alfredo Sumaran | 2017-03-15 | 1 | -0/+44 |
|\ | | | | | | | | | | | | | Toggle long Project names Closes #28187 See merge request !9501 | ||||
| * | Toggle project name if too long28187-project-name-cut-off-with-nested-groups | Sam Rose | 2017-03-13 | 1 | -0/+44 |
| | | |||||
* | | Merge branch 'preserve_order_issue_board' into 'master' | Douwe Maan | 2017-03-14 | 2 | -0/+41 |
|\ \ | | | | | | | | | | | | | Preserve order by priority on issues board See merge request !9939 | ||||
| * | | Preserve order by priority on issues boardpreserve_order_issue_board | Valery Sizov | 2017-03-14 | 2 | -0/+41 |
| | | | |||||
* | | | Merge branch '29425-fix-activity-stream-first-line-markdown' into 'master' | Robert Speicher | 2017-03-14 | 1 | -2/+18 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix first line markdown helper for user profile activity stream Closes #29425 See merge request !9920 | ||||
| * | | | Fix first line markdown helper for user profile activity stream29425-fix-activity-stream-first-line-markdown | Eric Eastwood | 2017-03-14 | 1 | -2/+18 |
| | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29425 | ||||
* | | | | Merge branch 'fix-intermittent-notify-spec' into 'master' | Rémy Coutable | 2017-03-14 | 1 | -111/+120 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix intermittent spec failures in notify_spec.rb See merge request !9935 | ||||
| * | | | | Fix intermittent spec failures in notify_spec.rb | Nick Thomas | 2017-03-14 | 1 | -111/+120 |
| | | | | | |||||
* | | | | | Merge branch 'issue-boards-new-search-bar' into 'master' | Filipa Lacerda | 2017-03-14 | 3 | -109/+62 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added filtered search bar to issue boards Closes #28312 See merge request !9757 | ||||
| * | | | | | Fixed up boards filter spec due to CSS classes changing | Phil Hughes | 2017-03-08 | 1 | -8/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also fixed issue with Vue resource encoding + in search term | ||||
| * | | | | | Updated specs | Phil Hughes | 2017-03-08 | 3 | -101/+56 |
| | | | | | | |||||
* | | | | | | Merge branch 'fix_relative_position_calculation' into 'master' | Douwe Maan | 2017-03-14 | 1 | -10/+110 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix relative position calculation Closes #29269 See merge request !9837 | ||||
| * | | | | | [Issue sorting]Addressed review commentsfix_relative_position_calculation | Valery Sizov | 2017-03-14 | 1 | -2/+64 |
| | | | | | | |||||
| * | | | | | [Issue Sorting] Improve migration | Valery Sizov | 2017-03-14 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | [Issue sorting] Filling positions preferable in the middle | Valery Sizov | 2017-03-14 | 1 | -14/+26 |
| | | | | | | |||||
| * | | | | | Fix relative position calculation | Valery Sizov | 2017-03-14 | 1 | -0/+27 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master' | Sean McGivern | 2017-03-14 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Use the v4 API from the frontend" Closes #28864 See merge request !9714 | ||||
| * | | | | | Update API on frontend to use v428864-use-the-v4-api-from-the-frontend | Sam Rose | 2017-03-14 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | Use options object to pass params for project endpoint | ||||
* | | | | | Merge branch 'rs-capybara-screenshot-artifacts' into 'master' | Kamil Trzciński | 2017-03-14 | 1 | -6/+3 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Store capybara screenshots as build artifacts Closes #13971 See merge request !7985 | ||||
| * | | | | Don't disable capybara-screenshot in CI environmentrs-capybara-screenshot-artifacts | Robert Speicher | 2016-12-08 | 1 | -6/+3 |
| | | | | | |||||
* | | | | | Merge branch 'nonewline-parser' into 'master' | Sean McGivern | 2017-03-14 | 1 | -0/+48 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Take nonewline context into account in diff parser Closes #28128 and #22636 See merge request !9705 | ||||
| * | | | | take nonewline context into account in diff parser | mhasbini | 2017-03-13 | 1 | -0/+48 |
| | | | | | |||||
* | | | | | Merge branch 'adam-count-badges-group-dashboard-milestones' into 'master' | Sean McGivern | 2017-03-14 | 1 | -0/+63 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add count badges to both dashboard and group milestones Closes #24421 See merge request !9836 | ||||
| * | | | | | Add count badges to both dashboard and group milestonesadam-count-badges-group-dashboard-milestones | Alex Braha Stoll | 2017-03-10 | 1 | -0/+63 |
| | | | | | | |||||
* | | | | | | Merge branch 'fix/regression-in-runners-registration-v1-api' into 'master' | Rémy Coutable | 2017-03-14 | 2 | -0/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix regression in runners registration v1 api See merge request !9904 | ||||
| * | | | | | | Fix regression in runners registration v1 apifix/regression-in-runners-registration-v1-api | Tomasz Maczukin | 2017-03-13 | 2 | -0/+6 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Use a button and a post request instead of UJS links - part 1 - Environments | Filipa Lacerda | 2017-03-14 | 12 | -82/+128 |
| | | | | | | |||||
* | | | | | | Organize our polyfills and standardize on core-js | Mike Greiling | 2017-03-13 | 15 | -112/+46 |
| | | | | | | |||||
* | | | | | | Merge branch 'feature/custom-lfs' into 'master' | Douwe Maan | 2017-03-13 | 3 | -30/+70 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show LFS object when LFS is disabled Closes #28817 See merge request !9779 | ||||
| * | | | | | | Do not show LFS object when LFS is disabled | Christopher Bartz | 2017-03-13 | 3 | -30/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not display a 404, when a user tries to retrieve the raw content of an LFS file (pointer) if the config option "lfs_enabled" is set to false. Instead, display the LFS pointer file directly. | ||||
* | | | | | | | Merge branch 'handle-failure-when-deleting-tags' into 'master' | Douwe Maan | 2017-03-13 | 1 | -6/+21 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display error message when deleting tag in web UI fails See merge request !9906 | ||||
| * | | | | | | | Display error message when deleting tag in web UI failshandle-failure-when-deleting-tags | Adam Niedzielski | 2017-03-13 | 1 | -6/+21 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '19742-permalink-blame-button-line-number-hash-links' into ↵ | Alfredo Sumaran | 2017-03-13 | 2 | -14/+101 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update permalink/blame buttons with line number fragment hash Closes #19742 See merge request !9461 | ||||
| * | | | | | | | | Update permalink/blame buttons with line number fragment hash19742-permalink-blame-button-line-number-hash-links | Eric Eastwood | 2017-03-13 | 2 | -14/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/19742 | ||||
* | | | | | | | | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' | Douwe Maan | 2017-03-13 | 11 | -106/+487 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new issue for a single discussion See merge request !8266 | ||||
| * | | | | | | | | | Rename variable | Bob Van Landuyt | 2017-03-13 | 8 | -34/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_request_for_resolving_discussions -> merge_request_to_resolve_discussions_of | ||||
| * | | | | | | | | | Separate flash messages for resolving one or multiple discussions | Bob Van Landuyt | 2017-03-13 | 1 | -12/+12 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Show correct message when user cannot resolve discussions | Bob Van Landuyt | 2017-03-13 | 2 | -77/+109 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Make sure the for a merge request only gets executed once. | Bob Van Landuyt | 2017-03-13 | 1 | -0/+19 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add a flash messages when an issue resolving discussions is created | Bob Van Landuyt | 2017-03-13 | 2 | -0/+24 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Build link to discussions to resolve in a helper | Bob Van Landuyt | 2017-03-13 | 1 | -0/+32 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Correctly indent quotes in new issue description | Bob Van Landuyt | 2017-03-13 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using `>`-quote style instead of `>>>`. Also: Update documentation images. | ||||
| * | | | | | | | | | No need to look up the notable separately in the ResolveService | Bob Van Landuyt | 2017-03-13 | 1 | -1/+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 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the MergeRequest is now a required param for resolving discussions | ||||
| * | | | | | | | | | Move functionality for resolving discussions into a concern | Bob Van Landuyt | 2017-03-13 | 1 | -3/+12 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add a button to delegate all discussions in a merge request | Bob Van Landuyt | 2017-03-13 | 1 | -20/+45 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Always require MR-iid for resolving discussions | Bob Van Landuyt | 2017-03-13 | 8 | -102/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And deduplicate the finding of MR's & discussions. Now the searching is done in the service, istead of the controller & the API. |