Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs-devise-emails' into 'master' | Robert Speicher | 2016-06-17 | 1 | -2/+21 |
|\ | |||||
| * | Add previews for all customized Devise emails | Robert Speicher | 2016-06-16 | 1 | -2/+21 |
* | | Merge remote-tracking branch 'dev/master' | Robert Speicher | 2016-06-16 | 1 | -0/+7 |
|\ \ | |||||
| * \ | Merge branch 'confidential-issue-notes' into 'master' | Robert Speicher | 2016-06-16 | 1 | -0/+7 |
| |\ \ | |||||
| | * | | Project members with guest role can't access notes on confidential issues | Douglas Barbosa Alexandre | 2016-06-14 | 1 | -0/+7 |
* | | | | Merge branch 'remove_jiraissue' into 'master' | Robert Speicher | 2016-06-17 | 5 | -37/+10 |
|\ \ \ \ | |||||
| * | | | | Remove JiraIssue model and replace references with ExternalIssue | Ilan Shamir | 2016-06-16 | 5 | -37/+10 |
* | | | | | Merge branch 'fix-project-find-with-namespace-order' into 'master' | Robert Speicher | 2016-06-17 | 1 | -1/+17 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fixed ordering in Project.find_with_namespacefix-project-find-with-namespace-order | Yorick Peterse | 2016-06-16 | 1 | -1/+17 |
* | | | | | Merge branch 'banzai-issue-filter-queries' into 'master' | Douwe Maan | 2016-06-16 | 3 | -4/+60 |
|\ \ \ \ \ | |||||
| * | | | | | Reduce queries in IssueReferenceFilterbanzai-issue-filter-queries | Yorick Peterse | 2016-06-16 | 3 | -4/+60 |
* | | | | | | Merge branch '13525-sane-defaults-for-merge-request-js-class-constructor' int... | Jacob Schatz | 2016-06-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Avoid a TypeError when initializing MergeRequest JS class with no arg13525-sane-defaults-for-merge-request-js-class-constructor | Rémy Coutable | 2016-06-15 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'template_dropdown' into 'master' | Jacob Schatz | 2016-06-16 | 3 | -5/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Implements TemplateDropdown class to create custom template dropdownstemplate_dropdown | Alfredo Sumaran | 2016-06-16 | 3 | -5/+22 |
* | | | | | | | Merge branch '18582-banzai-filter-external-link-filter' into 'master' | Yorick Peterse | 2016-06-16 | 1 | -11/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Banzai::Filter::ExternalLinkFilter use XPath18582-banzai-filter-external-link-filter | Paco Guzman | 2016-06-16 | 1 | -11/+23 |
* | | | | | | | | Merge branch 'fix/status-of-pipeline-without-builds' into 'master' | Rémy Coutable | 2016-06-16 | 3 | -3/+39 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into fix/status-of-pipeline-without-buildsfix/status-of-pipeline-without-builds | Grzegorz Bizon | 2016-06-15 | 58 | -207/+2802 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove reduntant method for building pipeline builds | Grzegorz Bizon | 2016-06-15 | 2 | -0/+4 |
| * | | | | | | | | Return false in create_builds if not builds created | Grzegorz Bizon | 2016-06-15 | 1 | -0/+10 |
| * | | | | | | | | Improve code clarity in pipeline create service | Grzegorz Bizon | 2016-06-14 | 1 | -2/+2 |
| * | | | | | | | | Remove ci commit specs that remain after bad merge | Grzegorz Bizon | 2016-06-14 | 1 | -403/+0 |
| * | | | | | | | | Merge branch 'master' into fix/status-of-pipeline-without-builds | Grzegorz Bizon | 2016-06-14 | 150 | -1087/+6017 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Refactor code reponsible for creating builds | Grzegorz Bizon | 2016-06-03 | 3 | -15/+3 |
| * | | | | | | | | | Fix specs for pipeline create for merge requests | Grzegorz Bizon | 2016-06-03 | 1 | -1/+4 |
| * | | | | | | | | | Update specs describe | Kamil Trzcinski | 2016-06-03 | 1 | -1/+1 |
| * | | | | | | | | | Update CreateCommitBuildsService to pass tests | Kamil Trzcinski | 2016-06-03 | 2 | -7/+7 |
| * | | | | | | | | | Save Ci::Commit object to persist all created builds | Kamil Trzcinski | 2016-06-03 | 2 | -2/+11 |
| * | | | | | | | | | Do not create pipeline objects when no builds | Grzegorz Bizon | 2016-06-03 | 1 | -1/+5 |
| * | | | | | | | | | Update ci commit pipeline specs according to changes | Grzegorz Bizon | 2016-06-03 | 2 | -9/+9 |
| * | | | | | | | | | Add minor improvements in create builds service | Grzegorz Bizon | 2016-06-03 | 1 | -1/+1 |
| * | | | | | | | | | Add specs covering case when there are no builds | Grzegorz Bizon | 2016-06-03 | 1 | -0/+18 |
| * | | | | | | | | | Refactor ci commit pipeline to prevent implicit saves | Grzegorz Bizon | 2016-06-03 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch '18591-banzai-filter-upload-link-filter' into 'master' | Yorick Peterse | 2016-06-16 | 1 | -2/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Banzai::Filter::UploadLinkFilter use XPath | Paco Guzman | 2016-06-16 | 1 | -2/+18 |
* | | | | | | | | | | | Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master' | Douwe Maan | 2016-06-16 | 1 | -16/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix permission checks in member rowbackport-view-condition-improvement-from-ee-460 | Rémy Coutable | 2016-06-15 | 1 | -16/+0 |
* | | | | | | | | | | | | Merge branch 'group-owners-association' into 'master' | Rémy Coutable | 2016-06-16 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Turn Group#owners into a has_many association | Yorick Peterse | 2016-06-16 | 1 | -0/+12 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search... | Fatih Acet | 2016-06-16 | 78 | -294/+3147 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'issuable-sidebar-bold' into 'master' | Jacob Schatz | 2016-06-15 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fixed tests | Phil Hughes | 2016-06-10 | 1 | -2/+2 |
| * | | | | | | | | | | | Merge branch 'fair-usage-of-shared-runners' into 'master' | Stan Hu | 2016-06-15 | 1 | -0/+62 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Make sure that we test RegisterBuildService behavior for deleted projectsfair-usage-of-shared-runners | Kamil Trzcinski | 2016-06-15 | 1 | -0/+22 |
| | * | | | | | | | | | | Fair usage of Shared Runners | Kamil Trzcinski | 2016-06-13 | 1 | -0/+40 |
| * | | | | | | | | | | | Merge branch '18338-change-admin-navigation-to-match-new-ui' into 'master' | Dmitriy Zaporozhets | 2016-06-15 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Fix admin hooks spec | Dmitriy Zaporozhets | 2016-06-15 | 1 | -1/+3 |
| * | | | | | | | | | | | | Prevent default disabled buttons and links.preventdefault-disabled-buttons | Fatih Acet | 2016-06-15 | 2 | -0/+32 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'docker-registry-manifest-v1' into 'master' | Rémy Coutable | 2016-06-15 | 2 | -25/+96 |
| |\ \ \ \ \ \ \ \ \ \ \ |