summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed default group sort optiongroup-sort-dropdown-blankPhil Hughes2017-10-063-1/+12
| | | | Closes #38808
* Merge branch 'rc/fix-flaky_example' into 'master'Grzegorz Bizon2017-10-0610-142/+507
|\ | | | | | | | | Fix flaky examples tracking See merge request gitlab-org/gitlab-ce!14681
| * Add new RSpecFlaky::FlakyExamplesCollection and RSpecFlaky::Config classesRémy Coutable2017-10-066-36/+250
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Improve the flaky examples detection jobsRémy Coutable2017-10-042-11/+14
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Ensure RSpecFlaky doesn't automatically update flaky examplesRémy Coutable2017-10-044-120/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, instantiating a RspecFlaky::FlakyExample object would automatically update its first_flaky_at, last_flaky_at and last_flaky_job. That was wrong because we would overwrite every time the suite report with this false data. We now: - Get the suite report and only read from it - Write only the currently detected flaky examples in the report, so that the final report is only updated with flaky examples that were actually detected in each job. Before, job1 could overwrite the legit report from job2! - Write the newly detected flaky examples by rejecting the already tracked flaky specs instead of using another hash. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '38846-fix-ee_compat_check_for-forks' into 'master'Sean McGivern2017-10-062-4/+7
|\ \ | | | | | | | | | | | | | | | | | | Fix the ee_compat_check task for forks Closes #38846 See merge request gitlab-org/gitlab-ce!14727
| * | Fix the ee_compat_check task for forksRémy Coutable2017-10-062-4/+7
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'workhorse-update' into 'master'Douwe Maan2017-10-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Update required Workhorse version to v3.2.0 See merge request gitlab-org/gitlab-ce!14715
| * | | Update required Workhorse version to v3.2.0workhorse-updateAlejandro Rodríguez2017-10-051-1/+1
| | | |
* | | | Merge branch '38845-skip-loading-english-frontend-translation-file' into ↵Phil Hughes2017-10-062-1/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Skip loading English Frontend Translation File" Closes #38845 See merge request gitlab-org/gitlab-ce!14722
| * | | Made the insertion of the English Translation File conditional + removed ↵38845-skip-loading-english-frontend-translation-fileTim Zallmann2017-10-062-1/+2
| | | | | | | | | | | | | | | | window.translations from the global object to save some memory
* | | | Merge branch '38696-fix-project-snippets-breadcrumb-link' into 'master'Rémy Coutable2017-10-062-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project snippets breadcrumb link Closes #38696 See merge request gitlab-org/gitlab-ce!14646
| * | | | Fix project snippets breadcrumb linkMark Fletcher2017-10-032-1/+6
| | | | |
* | | | | Merge branch 'docs/update-ruby-to-2-3-5-in-installation--and-update-guides' ↵Sean McGivern2017-10-062-3/+359
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update Ruby to 2.3.5 in installation and update guides See merge request gitlab-org/gitlab-ce!14725
| * | | | | Update Ruby to 2.3.5 in installation and update guidesRémy Coutable2017-10-062-3/+359
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'backstage/gb/move-some-pipelines-code-from-ee-to-ee' into 'master'Grzegorz Bizon2017-10-0619-6/+148
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move to CE some EE pipelines-related code that belongs to CE Closes gitlab-ee#3616 See merge request gitlab-org/gitlab-ce!14699
| * | | | | Improve pipeline optimistic locking implementationbackstage/gb/move-some-pipelines-code-from-ee-to-eeGrzegorz Bizon2017-10-051-2/+3
| | | | | |
| * | | | | Remove a redundant empty line in js pipelines specsGrzegorz Bizon2017-10-051-1/+0
| | | | | |
| * | | | | Fix frotnend pipeline specs for pipeline error badgeGrzegorz Bizon2017-10-051-1/+2
| | | | | |
| * | | | | Fix syntax error in forntend pipeline specsGrzegorz Bizon2017-10-051-2/+3
| | | | | |
| * | | | | Add js test for pipelines component with error badgeGrzegorz Bizon2017-10-051-0/+18
| | | | | |
| * | | | | Make it possible to export pipeline failure reasonGrzegorz Bizon2017-10-051-0/+1
| | | | | |
| * | | | | Add feature specs for pipeline failure reason badgeGrzegorz Bizon2017-10-052-0/+11
| | | | | |
| * | | | | Improve specs for pipeline failure reason presenterGrzegorz Bizon2017-10-053-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/presenters/ci/pipeline_presenter.rb
| * | | | | Expose failure reason in pipeline error badgeGrzegorz Bizon2017-10-052-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/serializers/pipeline_entity.rb
| * | | | | Set a pipeline failure reason when it has YAML errorsGrzegorz Bizon2017-10-053-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/ci/pipeline.rb
| * | | | | Pass pipeline failure reason to a transition eventGrzegorz Bizon2017-10-051-0/+6
| | | | | |
| * | | | | Move part of pipeline presenter to main CE fileGrzegorz Bizon2017-10-051-1/+8
| | | | | |
| * | | | | Add failure reason enum to CI/CD pipeline modelGrzegorz Bizon2017-10-051-0/+4
| | | | | |
| * | | | | Add failure_reason column to ci_pipelinesGrzegorz Bizon2017-10-052-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: db/schema.rb
| * | | | | Add a additional scope related to alive CI/CD statusesGrzegorz Bizon2017-10-052-0/+13
| | | | | |
| * | | | | Implement pipeline seeds size methodsGrzegorz Bizon2017-10-052-0/+6
| | | | | |
| * | | | | Add specs for methods that count pipeline seeds sizeGrzegorz Bizon2017-10-052-1/+15
| | | | | |
* | | | | | Merge branch 'fl-fix-ca-time-component' into 'master'Phil Hughes2017-10-063-1/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in cycle analytics breaking time component See merge request gitlab-org/gitlab-ce!14723
| * | | | | | Fix typo in cycle analytics breaking time componentfl-fix-ca-time-componentFilipa Lacerda2017-10-063-1/+64
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix/update-doorkeeper-openid-connect' into 'master'Rémy Coutable2017-10-066-18/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade doorkeeper-openid_connect See merge request gitlab-org/gitlab-ce!14372
| * | | | | | Upgrade doorkeeper-openid_connectMarkus Koller2017-09-206-19/+24
| | | | | | |
* | | | | | | Merge branch '2799-mysql-to-postgresql-docs' into 'master'Achilleas Pipinellis2017-10-061-55/+88
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how to use pgloader Closes gitlab-ee#2799 See merge request gitlab-org/gitlab-ce!13109
| * | | | | | Document how to use pgloaderLin Jen-Shin (godfat)2017-10-061-55/+88
|/ / / / / /
* | | | | | Merge branch ↵Tim Zallmann2017-10-066-14/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsistent' into 'master' Resolve "Monitoring graph axes labels are inaccurate and inconsistent" Closes #37105 See merge request gitlab-org/gitlab-ce!14258
| * | | | | | fix linter errors and karma specs37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsistentJose Ivan Vargas2017-10-054-5/+6
| | | | | | |
| * | | | | | add CHANGELOG.md entry for !14258Mike Greiling2017-10-051-0/+5
| | | | | | |
| * | | | | | display x-axis tick marksMike Greiling2017-10-051-2/+7
| | | | | | |
| * | | | | | fix x-axis pixel scale to account for transform x-offsetMike Greiling2017-10-051-1/+1
| | | | | | |
| * | | | | | rename graph_paths.vue consistent with all other sub-components of graph.vueMike Greiling2017-10-052-1/+1
| | | | | | |
| * | | | | | fix spelling ("outter" -> "outer")Mike Greiling2017-10-051-2/+2
| | | | | | |
| * | | | | | fix formattingMike Greiling2017-10-051-4/+6
| | | | | | |
* | | | | | | Merge branch '38835-protected-branch-selector-not-found-in-test' into 'master'Clement Ho2017-10-061-18/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Protected branch selector not found in test" Closes #38835 See merge request gitlab-org/gitlab-ce!14719
| * | | | | | | fix protected_branch spec describe block38835-protected-branch-selector-not-found-in-testJose Ivan Vargas2017-10-051-18/+17
| | | | | | | |
* | | | | | | | Merge branch '38389-allow-merge-without-success' into 'master'Fatih Acet2017-10-057-39/+38
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow merge when no pipeline success Closes #38389 See merge request gitlab-org/gitlab-ce!14633
View Lorry Controller Status