Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dm-snippet-blob-viewers' into 'master' | Sean McGivern | 2017-05-01 | 5 | -12/+270 |
|\ | | | | | | | | | Use blob viewers for snippets See merge request !10747 | ||||
| * | Use blob viewers for snippets | Douwe Maan | 2017-04-30 | 5 | -12/+270 |
| | | |||||
* | | Fixed transient failure related to dropdown animations31615-fix-dropdown-animation-failure | Luke "Jared" Bennett | 2017-04-30 | 1 | -0/+1 |
| | | |||||
* | | Another change from .click -> .trigger('click') to make spec pass | Stan Hu | 2017-04-28 | 1 | -1/+1 |
| | | |||||
* | | Change from .click -> .trigger('click') to make spec passrs-trigger-click | Robert Speicher | 2017-04-28 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'dm-pull-preserve-into-render-helpers' into 'master' | Sean McGivern | 2017-04-28 | 1 | -1/+1 |
|\ | | | | | | | | | Pull preserve into render helpers See merge request !10986 | ||||
| * | Pull preserve into render helpers | Douwe Maan | 2017-04-28 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '28020-improve-todo-list-when-comes-from-yourself' into 'master' | Sean McGivern | 2017-04-28 | 2 | -2/+79 |
|\ \ | | | | | | | | | | | | | | | | | | | Improve text on todo list when the todo action comes from yourself Closes #28020 See merge request !10594 | ||||
| * | | Improve text on todo list when the todo action comes from yourself | Jacopo | 2017-04-28 | 2 | -2/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved todo message when an issue is assigned to yourself. - The new message when an user assign to himself an issue or a mr is: "You assigned issue xx to yourself" - The new message when an user adds a todo to himself is: "You added a todo for issue xx" - The new message when and user mention himself is: "You mentioned yourself on issue xx" - The new message when an user directly address himself is: "You directly addressed yourself on issue xx" - The new message when an user mark himself as an approver is: "You set yourself as an approver for merge request xx" | ||||
* | | | add issues and merge-requests classes and use to find in rspecfix-sidebar-block-ref-test | Luke "Jared" Bennett | 2017-04-28 | 1 | -3/+2 |
| |/ |/| | |||||
* | | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb" | Dosuken shinya | 2017-04-28 | 3 | -0/+108 |
| | | |||||
* | | Use new renamed markup methoddm-blob-viewers | Douwe Maan | 2017-04-27 | 1 | -0/+2 |
| | | |||||
* | | Address feedback | Douwe Maan | 2017-04-27 | 1 | -2/+2 |
| | | |||||
* | | Add specs | Douwe Maan | 2017-04-27 | 1 | -23/+286 |
| | | |||||
* | | Render viewer error synchronously so that 'view the source' link will work | Douwe Maan | 2017-04-27 | 1 | -1/+1 |
| | | |||||
* | | Fix some specs | Douwe Maan | 2017-04-27 | 1 | -2/+3 |
| | | |||||
* | | Add specs | Douwe Maan | 2017-04-27 | 1 | -13/+42 |
| | | |||||
* | | Merge branch ↵ | Sean McGivern | 2017-04-27 | 1 | -0/+24 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized' into 'master' Resolve "Milestone sidebar display incorect number of MR when minimized" Closes #31292 See merge request !10933 | ||||
| * | | Added test31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized | Luke "Jared" Bennett | 2017-04-26 | 1 | -0/+24 |
| | | | |||||
* | | | Merge branch 'dz-add-cohort-spec' into 'master' | Sean McGivern | 2017-04-27 | 1 | -0/+15 |
|\ \ \ | | | | | | | | | | | | | | | | | Increase code coverage for admin/cohorts page See merge request !10964 | ||||
| * | | | Increase code coverage for admin/cohorts pagedz-add-cohort-spec | Dmitriy Zaporozhets | 2017-04-27 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Rename GitlabMarkdownHelper -> MarkupHelper | Toon Claes | 2017-04-27 | 2 | -2/+2 |
|/ / / | | | | | | | | | | It does more than solely GitLab Markdown, so rename to MarkupHelper. | ||||
* | | | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser' | Sean McGivern | 2017-04-27 | 1 | -0/+27 |
|\ \ \ | |||||
| * | | | Fix rendering emoji inside a string | blackst0ne | 2017-04-25 | 1 | -0/+27 |
| | | | | |||||
* | | | | Add button to delete filters from filtered search bar | Clement Ho | 2017-04-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Submodule Dockerfile templates | Zeger-Jan van de Weg | 2017-04-26 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch ↵ | Clement Ho | 2017-04-26 | 1 | -0/+30 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22826-ui-inconsistency-different-files-views-find-file-button-missing' into 'master' [#22826] Ensure find_file_link and download button is part of file tree header Closes #22826 See merge request !9847 | ||||
| * | | | | [#22826] Add newline before expect in accordance to four phase thoughtbot style | TM Lee | 2017-04-25 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | [#22826] Ensure find_file_link and download button is part of file tree header | TM Lee | 2017-04-23 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Move the find_file_link and download partial into the project tree_header partial - Added Changelog | ||||
* | | | | | Merge branch '26437-closed-by' into 'master' | Rémy Coutable | 2017-04-26 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add issues/:iid/closed_by api endpoint Closes #26437 See merge request !10511 | ||||
| * | | | | | Add issues/:iid/closed_by api endpoint | mhasbini | 2017-04-12 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'group-assignee-dropdown-send-group-id' into 'master' | Filipa Lacerda | 2017-04-26 | 1 | -0/+16 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assignee filter on group issues/merge requests only loads group users Closes #29490 See merge request !10884 | ||||
| * | | | | | Assignee filter on group issues/merge requests only loads group usersgroup-assignee-dropdown-send-group-id | Phil Hughes | 2017-04-24 | 1 | -0/+16 |
| | |/ / / | |/| | | | | | | | | | | | | | Closes #29490 | ||||
* | | | | | Show correct size when MR diff overflows | Sean McGivern | 2017-04-25 | 1 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that we often go via a diff object constructed from the diffs stored in the DB. Those diffs, by definition, don't overflow, so we don't have access to the 'correct' `real_size` - that is stored on the MR diff object iself. | ||||
* | | | | | Merge branch '31276-fix-diffs-with-edit-forking-needs' into 'master' | Douwe Maan | 2017-04-25 | 1 | -9/+38 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix diffs with edit-forking needs Closes #31276 See merge request !10868 | ||||
| * | | | | Fix diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needs | Eric Eastwood | 2017-04-24 | 1 | -9/+38 |
| |/ / / | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276 | ||||
* | | | | Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax' | Rémy Coutable | 2017-04-24 | 75 | -127/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | See merge request !10567 Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | Unnecessary "include WaitForAjax" and "include ApiHelpers" | Jacopo | 2017-04-21 | 75 | -127/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs. Removed unnecessary usage of `api:true` | ||||
* | | | | | Merge branch 'rs-empty-project-features' into 'master' | Rémy Coutable | 2017-04-24 | 17 | -42/+54 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use `:empty_project` where possible in top-level feature specs See merge request !10836 | ||||
| * | | | | | Use `:empty_project` where possible in top-level feature specsrs-empty-project-features | Robert Speicher | 2017-04-20 | 17 | -42/+54 |
| | | | | | | |||||
* | | | | | | Merge branch 'dz-fix-spec-filenames-ce' into 'master' | Sean McGivern | 2017-04-24 | 2 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect spec filenames which were ingored by CI See merge request !10875 | ||||
| * | | | | | | Fix outdated specs that were not executed due to wrong filename | Dmitriy Zaporozhets | 2017-04-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | Fix incorrect spec filenames which were ingored by CIdz-fix-spec-filenames-ce | Dmitriy Zaporozhets | 2017-04-24 | 2 | -0/+0 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | Added test to prevent ‘Request access’ regression29335-fix-request-access-button-visibility | James Edwards-Jones | 2017-04-22 | 1 | -0/+11 |
| |_|/ / / |/| | | | | |||||
* | | | | | Adding animation for all dropdown | Nur Rony | 2017-04-21 | 4 | -14/+16 |
|/ / / / | |||||
* | | | | Merge branch 'dz-refactor-create-members' into 'master' | Douwe Maan | 2017-04-20 | 2 | -2/+142 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Refactor code that creates and destroys project/group members See merge request !10735 | ||||
| * | | | Move some project/group members spinach tests to rspecdz-refactor-create-members | Dmitriy Zaporozhets | 2017-04-17 | 2 | -2/+142 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'fix/29125' into 'master' | Sean McGivern | 2017-04-20 | 1 | -0/+21 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of fix/29125-ee to CE Closes #29125 See merge request !10796 | ||||
| * | | | | Port of fix/29125-ee to CE | Douglas Barbosa Alexandre | 2017-04-19 | 1 | -0/+21 |
| | | | | | |||||
* | | | | | Refactor changing files in web UI | Douwe Maan | 2017-04-20 | 4 | -8/+8 |
|/ / / / |