summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix static analysis failure30138-display-cycle-analytics-issue-logic-fixesMałgorzata Ksionek2019-06-141-1/+1
|
* Move methods to common moduleMałgorzata Ksionek2019-06-143-58/+38
|
* Move call to separate methodMałgorzata Ksionek2019-06-141-4/+8
|
* Add cr remarksMałgorzata Ksionek2019-06-146-7/+7
|
* Add changelog entryMałgorzata Ksionek2019-06-141-0/+5
|
* Regenerate strings fileMałgorzata Ksionek2019-06-141-9/+0
|
* Fix rubocop offencesMałgorzata Ksionek2019-06-142-5/+9
|
* Add spec setup for test stageMałgorzata Ksionek2019-06-146-16/+54
|
* Rename filesMałgorzata Ksionek2019-06-1417-27/+17
| | | | Rename files from stageBaseQuery to stageHelper as in production stage.
* Add specs for staging stageMałgorzata Ksionek2019-06-144-0/+57
| | | | Add specs for staging stage and make sure it is finished while counting
* Fix multiple specsMałgorzata Ksionek2019-06-144-13/+26
|
* Add review stage queryMałgorzata Ksionek2019-06-144-0/+52
|
* Add spec for code stageMałgorzata Ksionek2019-06-143-2/+38
|
* Modify code base queryMałgorzata Ksionek2019-06-141-1/+1
|
* Add query for code stageMałgorzata Ksionek2019-06-143-0/+15
|
* Fix plan stage queryMałgorzata Ksionek2019-06-146-117/+21
| | | | Fix plan stage query and the way it is displayed
* Fix rubocop offencesMałgorzata Ksionek2019-06-142-7/+7
|
* Comment out failing plan stage query - need rethinkMałgorzata Ksionek2019-06-143-13/+13
|
* Add failing plan stage specMałgorzata Ksionek2019-06-147-8/+80
|
* Remove not needed includeMałgorzata Ksionek2019-06-141-1/+0
|
* Add issue stage events specsMałgorzata Ksionek2019-06-141-13/+21
|
* Add specs for issue stageMałgorzata Ksionek2019-06-141-0/+25
|
* Add different query for issue stageMałgorzata Ksionek2019-06-143-0/+22
|
* Merge branch 'docs-pull-mirroring-update' into 'master'Marcia Ramos2019-06-141-0/+3
|\ | | | | | | | | Docs: Add note clarifying the free status of pull mirroring See merge request gitlab-org/gitlab-ce!29580
| * Add free pull mirroring expiry notedocs-pull-mirroring-updateTristan Williams2019-06-121-0/+3
| |
* | Merge branch 'fix-link-in-process-docs' into 'master'Marcia Ramos2019-06-141-3/+1
|\ \ | | | | | | | | | | | | Fix a broken link in PROCESS.md See merge request gitlab-org/gitlab-ce!29607
| * | Fix a broken link in PROCESS.mdNick Thomas2019-06-131-3/+1
| | |
* | | Merge branch 'gt-fix-styling-for-pages-detail-page' into 'master'Filipa Lacerda2019-06-141-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix styling for `app/assets/stylesheets/pages/detail_page.scss` Closes #59900 See merge request gitlab-org/gitlab-ce!26870
| * | | Remove unused selectorGeorge Tsiolis2019-06-131-1/+0
| | | |
* | | | Merge branch 'dhiraj-fix-missing-deployment-rockets-in-monitoring-dashboard' ↵Filipa Lacerda2019-06-147-18/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix missing deployment rockets in monitor dashboard See merge request gitlab-org/gitlab-ce!29574
| * | | | Fix missing deployment rockets in monitor dashboardDhiraj Bodicherla2019-06-147-18/+19
|/ / / / | | | | | | | | | | | | | | | | | | | | Fixed inconsistencies in variable names for deployment endpoints for monitoring dashboard which causes deployment rocket icons to disappear
* | | | Merge branch 'gitlab-ce-asciidoc-include' into 'master'James Lopez2019-06-1410-41/+747
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for AsciiDoc include directive Closes #18045 See merge request gitlab-org/gitlab-ce!28417
| * | | | Add basic support for AsciiDoc include directiveGuillaume Grossetie2019-06-1410-41/+747
|/ / / / | | | | | | | | | | | | See http://asciidoctor.org/docs/user-manual/#include-directive
* | | | Merge branch 'fix-flyout-navs' into 'master'Phil Hughes2019-06-145-3/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix sidebar flyout navigation See merge request gitlab-org/gitlab-ce!29571
| * | | | Fix sidebar flyout navigationfix-flyout-navsLuke Bennett2019-06-135-3/+45
| | | | | | | | | | | | | | | | | | | | Show flyout nav for active item when collapsed.
* | | | | Merge branch 'fix-sticky-tabs-position' into 'master'Phil Hughes2019-06-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update height of $mr-tabs-height See merge request gitlab-org/gitlab-ce!29619
| * | | | | Update height of -tabs-heightfix-sticky-tabs-positionAnnabel Dunstone Gray2019-06-131-1/+1
| |/ / / /
* | | | | Merge branch 'gitea_import_ignore_pull_request_comments' into 'master'Ash McKenzie2019-06-142-10/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't import pull request comments from Gitea repos Closes #63071 See merge request gitlab-org/gitlab-ce!29521
| * | | | | Improve the gitea importer testJohn Kristensen2019-06-141-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes to the tests to support ignoring Gitea pull requests comments were a bit of a hack. The suggestions provided by Ash McKenzie in gitlab-org/gitlab-ce!29521 make things a bit more flexible if any future changes need to be made to the tests. The changes made to ignore
| * | | | | Don't import pull request comments from Gitea reposJohn Kristensen2019-06-122-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Gitea API does not provide the following API endpoint for pull request comments: /api/v1/repos/{owner}/{repo}/pulls/comments When the importer attempts to request this endpoint it receives a '404 Not Found' error which causes the import to fail. By skipping any attempts to import pull requests comments from Gitea we can ensure that the import can complete successfully.
* | | | | | Merge branch 'issue-62684' into 'master'Andreas Brandl2019-06-143-0/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 62684 See merge request gitlab-org/gitlab-ce!29430
| * \ \ \ \ \ rebaseissue-62684yguo2019-06-130-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Update down migrate for issue-62684yguo2019-06-110-0/+0
| | |\ \ \ \ \ \
| | | * | | | | | Add index on public_emails for users tableyguo2019-06-113-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up issue-62684 Update issue-62684 changelog
| | * | | | | | | Add index on public_emails for users tableyguo2019-06-113-1/+30
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up issue-62684 Update issue-62684 changelog Update down migrate for issue-62684
| * | | | | | | Add index on public_emails for users tableyguo2019-06-133-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up issue-62684 Update issue-62684 changelog Update down migrate for issue-62684
* | | | | | | | Merge branch 'rc/add_back_sidekiq_exporter' into 'master'Stan Hu2019-06-141-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add back sidekiq metrics exporter See merge request gitlab-org/gitlab-ce!29647
| * | | | | | | | Add back sidekiq metrics exporterrc/add_back_sidekiq_exporterRyan Cobb2019-06-131-0/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-correct-deploy-boards' into 'master'Evan Read2019-06-141-6/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove incorrect docs from deploy_boards.md See merge request gitlab-org/gitlab-ce!29591
| * | | | | | | | | Remove incorrect docs from deploy_boards.mddocs-correct-deploy-boardsDylan Griffith2019-06-131-6/+0
| | | | | | | | | |