summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-project-without-repo-and-wiki' into 'master' Rémy Coutable2017-03-161-0/+2
|\
| * Expect @issuable_meta_data to be set, feedback:fix-project-without-repo-and-wikiLin Jen-Shin2017-03-161-0/+1
| * Fix projects without repo and wikiLin Jen-Shin2017-03-151-0/+1
* | Merge branch '28494-mini-pipeline-graph-commit-view' into 'master' Jacob Schatz2017-03-163-1/+75
|\ \
| * | Adds pipeline mini-graph to system information box in Commit ViewFilipa Lacerda2017-03-163-1/+75
* | | Merge branch 'dm-fix-mailroom-config' into 'master' DJ Mountney2017-03-162-56/+64
|\ \ \ | |/ / |/| |
| * | Fix redis specDouwe Maan2017-03-152-33/+31
| * | Verify config/mail_room.yml is interpretable RubyDouwe Maan2017-03-151-25/+35
* | | Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'Stan Hu2017-03-153-136/+0
* | | Merge branch 'better-priority-sorting' into 'master' Douwe Maan2017-03-155-4/+94
|\ \ \
| * | | Allow filtering by all started milestonesbetter-priority-sortingSean McGivern2017-03-153-2/+52
| * | | Allow sorting by due date and label prioritySean McGivern2017-03-152-2/+42
* | | | Merge branch '27174-filter-filters' into 'master' Clement Ho2017-03-151-2/+29
|\ \ \ \
| * | | | prevent filtering Issues by multiple milestones, authors, or assignees27174-filter-filtersSimon Knox2017-03-111-2/+29
* | | | | Merge branch 'dm-copy-code-as-gfm' into 'master' Sean McGivern2017-03-156-336/+491
|\ \ \ \ \
| * | | | | Remove selectionToGFMdm-copy-code-as-gfmDouwe Maan2017-03-141-2/+7
| * | | | | Fix specsDouwe Maan2017-03-146-23/+21
| * | | | | Document tag option and clarify specDouwe Maan2017-03-141-1/+1
| * | | | | Copy code as GFM from diffs, blobs and GFM code blocksDouwe Maan2017-03-141-315/+467
| | |_|/ / | |/| | |
* | | | | Merge branch '27271-missing-time-spent-in-issue-webhook' into 'master' Douwe Maan2017-03-152-1/+16
|\ \ \ \ \
| * | | | | Include time tracking attributes in webhooks payload27271-missing-time-spent-in-issue-webhookRuben Davila2017-03-142-1/+16
* | | | | | Merge branch 'allow-resolving-conflicts-in-utf-8' into 'master' Robert Speicher2017-03-151-30/+59
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8Sean McGivern2017-03-151-30/+59
* | | | | | Merge branch '27551-use-dev-mirror-of-gitlab-git-test-on-dev' into 'master' Sean McGivern2017-03-152-4/+4
|\ \ \ \ \ \
| * | | | | | Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different gitlab-git-...27551-use-dev-mirror-of-gitlab-git-test-on-devRémy Coutable2017-03-142-4/+4
* | | | | | | Merge branch 'rs-dropdown-author-spec-speed' into 'master' Rémy Coutable2017-03-151-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Speed up the issues/filtered_search/dropdown_author feature specrs-dropdown-author-spec-speedRobert Speicher2017-03-141-2/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Display full project name with namespace upon deletionMark Fletcher2017-03-151-2/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch '28187-project-name-cut-off-with-nested-groups' into 'master' Alfredo Sumaran2017-03-151-0/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Toggle project name if too long28187-project-name-cut-off-with-nested-groupsSam Rose2017-03-131-0/+44
* | | | | | Merge branch 'preserve_order_issue_board' into 'master' Douwe Maan2017-03-142-0/+41
|\ \ \ \ \ \
| * | | | | | Preserve order by priority on issues boardpreserve_order_issue_boardValery Sizov2017-03-142-0/+41
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '29425-fix-activity-stream-first-line-markdown' into 'master' Robert Speicher2017-03-141-2/+18
|\ \ \ \ \ \
| * | | | | | Fix first line markdown helper for user profile activity stream29425-fix-activity-stream-first-line-markdownEric Eastwood2017-03-141-2/+18
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-intermittent-notify-spec' into 'master' Rémy Coutable2017-03-141-111/+120
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix intermittent spec failures in notify_spec.rbNick Thomas2017-03-141-111/+120
* | | | | | Merge branch 'issue-boards-new-search-bar' into 'master' Filipa Lacerda2017-03-143-109/+62
|\ \ \ \ \ \
| * | | | | | Fixed up boards filter spec due to CSS classes changingPhil Hughes2017-03-081-8/+6
| * | | | | | Updated specsPhil Hughes2017-03-083-101/+56
* | | | | | | Merge branch 'fix_relative_position_calculation' into 'master' Douwe Maan2017-03-141-10/+110
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | [Issue sorting]Addressed review commentsfix_relative_position_calculationValery Sizov2017-03-141-2/+64
| * | | | | | [Issue Sorting] Improve migrationValery Sizov2017-03-141-1/+0
| * | | | | | [Issue sorting] Filling positions preferable in the middleValery Sizov2017-03-141-14/+26
| * | | | | | Fix relative position calculationValery Sizov2017-03-141-0/+27
| | |/ / / / | |/| | | |
* | | | | | Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master' Sean McGivern2017-03-141-1/+1
|\ \ \ \ \ \
| * | | | | | Update API on frontend to use v428864-use-the-v4-api-from-the-frontendSam Rose2017-03-141-1/+1
| |/ / / / /
* | | | | | Merge branch 'rs-capybara-screenshot-artifacts' into 'master' Kamil Trzciński2017-03-141-6/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Don't disable capybara-screenshot in CI environmentrs-capybara-screenshot-artifactsRobert Speicher2016-12-081-6/+3
* | | | | | Merge branch 'nonewline-parser' into 'master' Sean McGivern2017-03-141-0/+48
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | take nonewline context into account in diff parsermhasbini2017-03-131-0/+48