summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-devise-emails' into 'master' Robert Speicher2016-06-171-2/+21
|\
| * Add previews for all customized Devise emailsRobert Speicher2016-06-161-2/+21
* | Merge remote-tracking branch 'dev/master'Robert Speicher2016-06-161-0/+7
|\ \
| * \ Merge branch 'confidential-issue-notes' into 'master' Robert Speicher2016-06-161-0/+7
| |\ \
| | * | Project members with guest role can't access notes on confidential issuesDouglas Barbosa Alexandre2016-06-141-0/+7
* | | | Merge branch 'remove_jiraissue' into 'master' Robert Speicher2016-06-175-37/+10
|\ \ \ \
| * | | | Remove JiraIssue model and replace references with ExternalIssueIlan Shamir2016-06-165-37/+10
* | | | | Merge branch 'fix-project-find-with-namespace-order' into 'master' Robert Speicher2016-06-171-1/+17
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixed ordering in Project.find_with_namespacefix-project-find-with-namespace-orderYorick Peterse2016-06-161-1/+17
* | | | | Merge branch 'banzai-issue-filter-queries' into 'master' Douwe Maan2016-06-163-4/+60
|\ \ \ \ \
| * | | | | Reduce queries in IssueReferenceFilterbanzai-issue-filter-queriesYorick Peterse2016-06-163-4/+60
* | | | | | Merge branch '13525-sane-defaults-for-merge-request-js-class-constructor' int...Jacob Schatz2016-06-161-1/+1
|\ \ \ \ \ \
| * | | | | | Avoid a TypeError when initializing MergeRequest JS class with no arg13525-sane-defaults-for-merge-request-js-class-constructorRémy Coutable2016-06-151-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'template_dropdown' into 'master' Jacob Schatz2016-06-163-5/+22
|\ \ \ \ \ \
| * | | | | | Implements TemplateDropdown class to create custom template dropdownstemplate_dropdownAlfredo Sumaran2016-06-163-5/+22
* | | | | | | Merge branch '18582-banzai-filter-external-link-filter' into 'master' Yorick Peterse2016-06-161-11/+23
|\ \ \ \ \ \ \
| * | | | | | | Banzai::Filter::ExternalLinkFilter use XPath18582-banzai-filter-external-link-filterPaco Guzman2016-06-161-11/+23
* | | | | | | | Merge branch 'fix/status-of-pipeline-without-builds' into 'master' Rémy Coutable2016-06-163-3/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into fix/status-of-pipeline-without-buildsfix/status-of-pipeline-without-buildsGrzegorz Bizon2016-06-1558-207/+2802
| |\ \ \ \ \ \ \
| * | | | | | | | Remove reduntant method for building pipeline buildsGrzegorz Bizon2016-06-152-0/+4
| * | | | | | | | Return false in create_builds if not builds createdGrzegorz Bizon2016-06-151-0/+10
| * | | | | | | | Improve code clarity in pipeline create serviceGrzegorz Bizon2016-06-141-2/+2
| * | | | | | | | Remove ci commit specs that remain after bad mergeGrzegorz Bizon2016-06-141-403/+0
| * | | | | | | | Merge branch 'master' into fix/status-of-pipeline-without-buildsGrzegorz Bizon2016-06-14150-1087/+6017
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Refactor code reponsible for creating buildsGrzegorz Bizon2016-06-033-15/+3
| * | | | | | | | | Fix specs for pipeline create for merge requestsGrzegorz Bizon2016-06-031-1/+4
| * | | | | | | | | Update specs describeKamil Trzcinski2016-06-031-1/+1
| * | | | | | | | | Update CreateCommitBuildsService to pass testsKamil Trzcinski2016-06-032-7/+7
| * | | | | | | | | Save Ci::Commit object to persist all created buildsKamil Trzcinski2016-06-032-2/+11
| * | | | | | | | | Do not create pipeline objects when no buildsGrzegorz Bizon2016-06-031-1/+5
| * | | | | | | | | Update ci commit pipeline specs according to changesGrzegorz Bizon2016-06-032-9/+9
| * | | | | | | | | Add minor improvements in create builds serviceGrzegorz Bizon2016-06-031-1/+1
| * | | | | | | | | Add specs covering case when there are no buildsGrzegorz Bizon2016-06-031-0/+18
| * | | | | | | | | Refactor ci commit pipeline to prevent implicit savesGrzegorz Bizon2016-06-031-1/+1
* | | | | | | | | | Merge branch '18591-banzai-filter-upload-link-filter' into 'master' Yorick Peterse2016-06-161-2/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Banzai::Filter::UploadLinkFilter use XPathPaco Guzman2016-06-161-2/+18
* | | | | | | | | | | Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master' Douwe Maan2016-06-161-16/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix permission checks in member rowbackport-view-condition-improvement-from-ee-460Rémy Coutable2016-06-151-16/+0
* | | | | | | | | | | | Merge branch 'group-owners-association' into 'master' Rémy Coutable2016-06-161-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Turn Group#owners into a has_many associationYorick Peterse2016-06-161-0/+12
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search...Fatih Acet2016-06-1678-294/+3147
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'issuable-sidebar-bold' into 'master' Jacob Schatz2016-06-151-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed testsPhil Hughes2016-06-101-2/+2
| * | | | | | | | | | | Merge branch 'fair-usage-of-shared-runners' into 'master' Stan Hu2016-06-151-0/+62
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Make sure that we test RegisterBuildService behavior for deleted projectsfair-usage-of-shared-runnersKamil Trzcinski2016-06-151-0/+22
| | * | | | | | | | | | Fair usage of Shared RunnersKamil Trzcinski2016-06-131-0/+40
| * | | | | | | | | | | Merge branch '18338-change-admin-navigation-to-match-new-ui' into 'master' Dmitriy Zaporozhets2016-06-151-1/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix admin hooks specDmitriy Zaporozhets2016-06-151-1/+3
| * | | | | | | | | | | | Prevent default disabled buttons and links.preventdefault-disabled-buttonsFatih Acet2016-06-152-0/+32
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'docker-registry-manifest-v1' into 'master' Rémy Coutable2016-06-152-25/+96
| |\ \ \ \ \ \ \ \ \ \ \