summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '22229-use-base-sha-when-downloading-merge-requests' into 'master' Robert Speicher2016-09-251-3/+37
|\
| * Use base SHA for patches and diffsNick Thomas2016-09-221-3/+37
* | Merge branch 'gitlab-ce-milestone-tab-badges' into 'master' Fatih Acet2016-09-242-1/+39
|\ \
| * | Ensure milestone counts work with no datagitlab-ce-milestone-tab-badgesAlfredo Sumaran2016-09-071-19/+17
| * | Fix failing specs and improve htmlAlfredo Sumaran2016-09-071-10/+12
| * | Updated milestone count helper plus testsDan Rowden2016-09-072-1/+39
* | | Merge branch 'fix/speed-up-group-milestone-show' into 'master' Yorick Peterse2016-09-231-2/+3
|\ \ \
| * | | Ensure milestones passed to GlobalMilestone is an ActiveRecord::RelationAhmad Sherif2016-09-231-2/+3
* | | | Merge branch 'redis-config-mutation' into 'master' Robert Speicher2016-09-231-7/+45
|\ \ \ \ | |/ / / |/| | |
| * | | Make Gitlab::Redis.params safe for mutationJacob Vosmaer2016-09-221-7/+45
* | | | Merge branch 'search-filters-label-fix' into 'master' Jacob Schatz2016-09-231-0/+32
|\ \ \ \
| * | | | Fixed search dropdown labels not displayingsearch-filters-label-fixPhil Hughes2016-09-121-0/+32
* | | | | Revert part of "Merge branch 'update_issues_mr_counter' into 'master'Rémy Coutable2016-09-222-41/+0
* | | | | Revert "Merge branch '22421-fix-issuable-counter-when-more-than-one-label-is-...Rémy Coutable2016-09-221-13/+7
* | | | | Merge branch '22417-api-fork-fix' into 'master' Rémy Coutable2016-09-221-2/+2
|\ \ \ \ \
| * | | | | API: Return 404 when trying to fork to unaccessible namespaceRémy Coutable2016-09-221-2/+2
* | | | | | Merge branch 'fix-pipeline-for-empty-merge-request-diff' into 'master' Rémy Coutable2016-09-222-6/+43
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add test for MergeRequestDiff#commits_sha, feedback:Lin Jen-Shin2016-09-221-0/+22
| * | | | | For empty merge_request_diff st_commits would be nilfix-pipeline-for-empty-merge-request-diffLin Jen-Shin2016-09-221-6/+21
| | |/ / / | |/| | |
* | | | | Hotfix the issuable counters when filtering by multiple labels22421-fix-issuable-counter-when-more-than-one-label-is-selectedRémy Coutable2016-09-221-7/+13
|/ / / /
* | | | fix import/export security specs after mergeJames Lopez2016-09-212-1/+12
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-09-213-2/+23
|\ \ \ \
| * | | | fixing security specs after mergeJames Lopez2016-09-213-2/+23
* | | | | Merge branch 'and-you-get-awards' into 'master' Rémy Coutable2016-09-213-3/+86
|\ \ \ \ \
| * | | | | Fix tests for Snippets toggling awardsZ.J. van de Weg2016-09-192-6/+8
| * | | | | API support for Award Emoji on SnippetsZ.J. van de Weg2016-09-191-5/+50
| * | | | | Snippets get award emoji! :thumbsup:Z.J. van de Weg2016-09-193-2/+38
* | | | | | Merge branch 'rs-simplify-fetch_members' into 'master' Rémy Coutable2016-09-212-0/+68
|\ \ \ \ \ \
| * | | | | | Fix a logic error in ProjectTeam#fetch_invited_membersRobert Speicher2016-09-201-0/+1
| * | | | | | Add specs for ProjectTeam#fetch_membersRobert Speicher2016-09-202-0/+67
* | | | | | | Merge branch 'show-all-pipelines-from-all-diffs' into 'master' Rémy Coutable2016-09-211-6/+53
|\ \ \ \ \ \ \
| * | | | | | | Use factory instead of using new directly. Feedback:show-all-pipelines-from-all-diffsLin Jen-Shin2016-09-211-9/+2
| * | | | | | | Add a test for non-persisted merge requestLin Jen-Shin2016-09-201-0/+22
| * | | | | | | Test against MergeRequest#all_commits_sha, feedback:Lin Jen-Shin2016-09-201-9/+22
| * | | | | | | Show all pipelines from all merge_request_diffs:Lin Jen-Shin2016-09-191-6/+25
* | | | | | | | Merge branch 'limit-number-of-shown-environments' into 'master' Rémy Coutable2016-09-213-6/+90
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Scope environments to projectlimit-number-of-shown-environmentsKamil Trzcinski2016-09-211-0/+2
| * | | | | | | Improve specsKamil Trzcinski2016-09-212-4/+5
| * | | | | | | Add tests to verify the correctness of returned environmentsKamil Trzcinski2016-09-212-6/+87
* | | | | | | | Merge branch 'add_spec_for_committer_hash' into 'master' Rémy Coutable2016-09-211-0/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Add spec covering 'committer_hash'Dan Dunckel2016-09-201-0/+45
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-09-21111-892/+3324
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'post-merge-improve-of-ci-permissions' into 'master' Rémy Coutable2016-09-213-7/+15
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Improve JwtController implementationpost-merge-improve-of-ci-permissionsKamil Trzcinski2016-09-201-3/+5
| | * | | | | | | Post-merge improve of CI permissionsKamil Trzcinski2016-09-203-7/+13
| * | | | | | | | Merge branch '21170-cycle-analytics' into 'master' Stan Hu2016-09-2121-1/+1044
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix `CreateDeploymentService` spec.Timothy Andrew2016-09-211-1/+4
| | * | | | | | | | Reload issues in spec to ensure label<->issue mapping properly loaded21170-cycle-analyticsStan Hu2016-09-201-0/+2
| | * | | | | | | | Fix build.Timothy Andrew2016-09-213-8/+8
| | * | | | | | | | Add a spec for merge request metric caching while refreshing a merge request ...Timothy Andrew2016-09-213-11/+37