summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-291-0/+17
* Merge branch '25996-Move-award-emoji-out-of-the-discussion-tab-for-MR' into '...Fatih Acet2016-12-291-2/+2
|\
| * Fix MR versions spec25996-Move-award-emoji-out-of-the-discussion-tab-for-MRAnnabel Dunstone Gray2016-12-291-2/+2
* | Merge branch 'issue_25682' into 'master' Sean McGivern2016-12-292-1/+22
|\ \
| * | Parse JIRA issue references even if Issue Tracker is disabledFelipe Artur2016-12-292-1/+22
* | | Merge branch 'dz-nested-group-misc' into 'master' Dmitriy Zaporozhets2016-12-292-4/+40
|\ \ \
| * | | Refactor nested group related codedz-nested-group-miscDmitriy Zaporozhets2016-12-291-1/+1
| * | | Show nested groups tab on group pageDmitriy Zaporozhets2016-12-261-0/+13
| * | | Add nested groups support to the Groups::CreateServiceDmitriy Zaporozhets2016-12-261-4/+27
* | | | Merge branch 'grapify-settings-api' into 'master' Sean McGivern2016-12-291-2/+1
|\ \ \ \
| * | | | Grapify the settings APIgrapify-settings-apiRobert Schilling2016-12-291-2/+1
* | | | | Merge branch 'dz-fix-milestones-spec' into 'master' Dmitriy Zaporozhets2016-12-291-0/+6
|\ \ \ \ \
| * | | | | Wait for ajax request to complete when testing milestont drang-n-drop featureDmitriy Zaporozhets2016-12-291-0/+6
* | | | | | Merge branch 'issue_22664' into 'master' Sean McGivern2016-12-299-5/+171
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Check if user can read issue before being assignedissue_22664Felipe Artur2016-12-279-10/+156
| * | | | | Fix issuable assignee update bug when previous assignee is nullFelipe Artur2016-12-201-0/+20
* | | | | | Merge branch 'mentioned-but-not-closed-issues-messages' into 'master' Sean McGivern2016-12-291-3/+7
|\ \ \ \ \ \
| * | | | | | use MergeRequest#closes_issues instead of rewriting code to retrieve closing ...Gabriel Gizotti2016-12-281-3/+7
* | | | | | | Merge branch 'dz-nested-group-access' into 'master' Dmitriy Zaporozhets2016-12-292-0/+77
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Include group parents into read access for project and groupDmitriy Zaporozhets2016-12-262-0/+77
* | | | | | Merge branch 'gfm-new-line-fix' into 'master' Fatih Acet2016-12-281-0/+12
|\ \ \ \ \ \
| * | | | | | Fix GFM dropdown not showing at beginning of new linesgfm-new-line-fixPhil Hughes2016-12-281-0/+12
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '19988-prevent-empty-pagination-when-list-not-empty' into 'master' Douwe Maan2016-12-284-2/+109
|\ \ \ \ \ \
| * | | | | | applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-emptyTiago Botelho2016-12-234-8/+10
| * | | | | | adds specs for respective behaviourTiago Botelho2016-12-214-2/+107
* | | | | | | Merge branch 'dz-improve-admin-group-routing' into 'master' Sean McGivern2016-12-281-2/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix 500 error when visit group from admin area if group name contains dotdz-improve-admin-group-routingDmitriy Zaporozhets2016-12-281-2/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '26126-cache-even-when-no-projects' into 'master' Yorick Peterse2016-12-281-6/+31
|\ \ \ \ \ \ \
| * | | | | | | Cache project authorizations even when user has access to zero projects26126-cache-even-when-no-projectsAdam Niedzielski2016-12-281-6/+31
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'fix-admin-group-page' into 'master' Sean McGivern2016-12-281-0/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix: Admin group show page does not workfix-admin-group-pageValery Sizov2016-12-281-0/+10
| |/ / / / /
* | | | | | Merge branch 'fix/mentioned-issue-text-grammar' into 'master' Sean McGivern2016-12-281-2/+2
|\ \ \ \ \ \
| * | | | | | Fix grammar error in text about mentioned issuesGrzegorz Bizon2016-12-281-2/+2
| |/ / / / /
* | | | | | Merge branch 'fix-api-deprecation' into 'master' Robert Schilling2016-12-281-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix a Grape deprecation, use `#request_method` instead of `#route_method`fix-api-deprecationRémy Coutable2016-12-231-2/+2
* | | | | | Merge branch '18786-go-to-a-project-order' into 'master' Alfredo Sumaran2016-12-272-1/+2
|\ \ \ \ \ \
| * | | | | | Go to a project orderJacopo2016-12-152-1/+2
* | | | | | | Merge branch '1659-long-tag-title' into 'master' Annabel Dunstone Gray2016-12-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Truncate tag description and fix mobile for inidividual tag1659-long-tag-titleSam Rose2016-12-271-1/+1
* | | | | | | | Merge branch 'master' into 'dz-rename-reserved-project-names'Dmitriy Zaporozhets2016-12-2729-74/+593
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-276-15/+72
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use consistent names and move checks to the method,Lin Jen-Shin2016-12-202-4/+4
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-20221-1341/+6685
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge CSSFilipa Lacerda2016-12-12103-420/+2756
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix tests and also add tests for non-existing repoLin Jen-Shin2016-12-101-1/+15
| | * | | | | | | | | | Now we need to include EmailHelpers for each testLin Jen-Shin2016-12-062-0/+4
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-06246-3458/+6711
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-22152-841/+5550
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add tests for key/deploy key notificationsLin Jen-Shin2016-11-182-0/+24
| | * | | | | | | | | | | | Fix an old copypasta: internal -> privateLin Jen-Shin2016-11-181-1/+1