| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fixed eslint errors | Phil Hughes | 2017-03-16 | 1 | -107/+69 |
| | | | | | Updated modal filter spec | ||||
| * | Merge branch '28494-mini-pipeline-graph-commit-view' into 'master' | Jacob Schatz | 2017-03-16 | 3 | -1/+75 |
| |\ | | | | | | | | | | | | | Adds pipeline mini-graph to system information box in Commit View Closes #28494 See merge request !9902 | ||||
| | * | Adds pipeline mini-graph to system information box in Commit View | Filipa Lacerda | 2017-03-16 | 3 | -1/+75 |
| | | | |||||
| * | | Merge branch 'dm-fix-mailroom-config' into 'master' | DJ Mountney | 2017-03-16 | 2 | -56/+64 |
| |\ \ | |/ |/| | | | | | Fix reply by email by fixing config/mail_room.yml to be interpretable without ActiveSupport See merge request !9979 | ||||
| | * | Fix redis spec | Douwe Maan | 2017-03-15 | 2 | -33/+31 |
| | | | |||||
| | * | Verify config/mail_room.yml is interpretable Ruby | Douwe Maan | 2017-03-15 | 1 | -25/+35 |
| | | | |||||
| * | | Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master' | Stan Hu | 2017-03-15 | 3 | -136/+0 |
| | | | | | | | | | | | This reverts commit 5e9666880376b3f53edb95cba77b5642d3cc1810, reversing changes made to b35378a938e22f745b6c6ea32b53cb50f9b6c627. | ||||
| * | | Merge branch 'better-priority-sorting' into 'master' | Douwe Maan | 2017-03-15 | 5 | -4/+94 |
| |\ \ | | | | | | | | | | | | | | | | | | | Better priority sorting Closes #28754 See merge request !9938 | ||||
| | * | | Allow filtering by all started milestonesbetter-priority-sorting | Sean McGivern | 2017-03-15 | 3 | -2/+52 |
| | | | | |||||
| | * | | Allow sorting by due date and label priority | Sean McGivern | 2017-03-15 | 2 | -2/+42 |
| | | | | |||||
| * | | | Merge branch '27174-filter-filters' into 'master' | Clement Ho | 2017-03-15 | 1 | -2/+29 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | prevent filtering Issues by multiple milestones, authors, or assignees Closes #27174 See merge request !9406 | ||||
| | * | | | prevent filtering Issues by multiple milestones, authors, or assignees27174-filter-filters | Simon Knox | 2017-03-11 | 1 | -2/+29 |
| | | | | | |||||
| * | | | | Merge branch 'dm-copy-code-as-gfm' into 'master' | Sean McGivern | 2017-03-15 | 6 | -336/+491 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Copy code as GFM from diffs, blobs and GFM code blocks See merge request !9874 | ||||
| | * | | | | Remove selectionToGFMdm-copy-code-as-gfm | Douwe Maan | 2017-03-14 | 1 | -2/+7 |
| | | | | | | |||||
| | * | | | | Fix specs | Douwe Maan | 2017-03-14 | 6 | -23/+21 |
| | | | | | | |||||
| | * | | | | Document tag option and clarify spec | Douwe Maan | 2017-03-14 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Copy code as GFM from diffs, blobs and GFM code blocks | Douwe Maan | 2017-03-14 | 1 | -315/+467 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch '27271-missing-time-spent-in-issue-webhook' into 'master' | Douwe Maan | 2017-03-15 | 2 | -1/+16 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include time tracking attributes in webhooks payload Closes #27271 See merge request !9942 | ||||
| | * | | | | Include time tracking attributes in webhooks payload27271-missing-time-spent-in-issue-webhook | Ruben Davila | 2017-03-14 | 2 | -1/+16 |
| | | | | | | |||||
| * | | | | | Merge branch 'allow-resolving-conflicts-in-utf-8' into 'master' | Robert Speicher | 2017-03-15 | 1 | -30/+59 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Allow resolving conflicts with non-ASCII chars Closes #26214 See merge request !9937 | ||||
| | * | | | | Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8 | Sean McGivern | 2017-03-15 | 1 | -30/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We wanted to check that the text could be encoded as JSON, because conflict resolutions are passed back and forth in that format, so the file itself must be UTF-8. However, all strings from the repository come back without an encoding from Rugged, making them ASCII_8BIT. We force to UTF-8, and reject if it's invalid. This still leaves the problem of a file that 'looks like' UTF-8 (contains valid UTF-8 byte sequences), but isn't. However: 1. If the conflicts contain the problem bytes, the user will see that the file isn't displayed correctly. 2. If the problem bytes are outside of the conflict area, then we will write back the same bytes when we resolve the conflicts, even though we though the encoding was UTF-8. | ||||
| * | | | | | Merge branch '27551-use-dev-mirror-of-gitlab-git-test-on-dev' into 'master' | Sean McGivern | 2017-03-15 | 2 | -4/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different gitlab-git-test repo Closes #27551 See merge request !9945 | ||||
| | * | | | | | Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different ↵27551-use-dev-mirror-of-gitlab-git-test-on-dev | Rémy Coutable | 2017-03-14 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-git-test repo We will set this to the dev mirror in GitLab CE and EE on dev. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Merge branch 'rs-dropdown-author-spec-speed' into 'master' | Rémy Coutable | 2017-03-15 | 1 | -2/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up the issues/filtered_search/dropdown_author feature spec See merge request !9951 | ||||
| | * | | | | | | Speed up the issues/filtered_search/dropdown_author feature specrs-dropdown-author-spec-speed | Robert Speicher | 2017-03-14 | 1 | -2/+3 |
| | | |_|_|/ / | |/| | | | | |||||
| * | | | | | | 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 |
| | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |