Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add external_url_formatteddeployment-status-presenter | Shinya Maeda | 2018-10-17 | 1 | -1/+9 |
| | |||||
* | Fix methods in common | Shinya Maeda | 2018-10-17 | 1 | -7/+16 |
| | |||||
* | Merge branch 'stateful_deployments' into deployment-status-presenter | Shinya Maeda | 2018-10-17 | 1 | -3/+7 |
|\ | |||||
| * | Fix recursive call | Shinya Maeda | 2018-10-17 | 1 | -3/+7 |
| | | |||||
* | | Merge branch 'stateful_deployments' into deployment-status-presenter | Shinya Maeda | 2018-10-17 | 3 | -9/+23 |
|\ \ | |/ | |||||
| * | Add finished_at | Shinya Maeda | 2018-10-17 | 3 | -9/+23 |
| | | |||||
* | | Remove unnecessary status entiry. Create texts for environment_text for both ↵ | Shinya Maeda | 2018-10-17 | 11 | -80/+69 |
| | | | | | | | | pipeline and job | ||||
* | | Remove last_successful_deployment | Shinya Maeda | 2018-10-17 | 4 | -5/+12 |
| | | |||||
* | | Merge branch 'stateful_deployments' into deployment-status-presenter | Shinya Maeda | 2018-10-17 | 3 | -31/+17 |
|\ \ | |/ | |||||
| * | Fix last_deployment methods as it used to return successful deployment always | Shinya Maeda | 2018-10-17 | 2 | -2/+2 |
| | | |||||
| * | Redefine statuses | Shinya Maeda | 2018-10-17 | 1 | -29/+15 |
| | | |||||
* | | return deployment_path if not exist | Shinya Maeda | 2018-10-17 | 2 | -0/+4 |
| | | |||||
* | | Merge branch 'stateful_deployments' into deployment-status-presenter | Shinya Maeda | 2018-10-17 | 1 | -10/+1 |
|\ \ | |/ | |||||
| * | Fix schema.rb | Shinya Maeda | 2018-10-17 | 1 | -10/+1 |
| | | |||||
* | | Split change of use-deployment-status-in-job-log-page | Shinya Maeda | 2018-10-17 | 3 | -29/+13 |
| | | |||||
* | | Fix deployment status facility | Shinya Maeda | 2018-10-17 | 12 | -20/+26 |
| | | |||||
* | | Use deployment status in job log page | Shinya Maeda | 2018-10-17 | 17 | -13/+257 |
|/ | |||||
* | Default status nil to success | Shinya Maeda | 2018-10-17 | 1 | -0/+7 |
| | |||||
* | Add status to Deployment | Shinya Maeda | 2018-10-17 | 10 | -19/+121 |
| | |||||
* | Merge branch 'prettify-all-the-things-8' into 'master' | Fatih Acet | 2018-10-16 | 50 | -1051/+1330 |
|\ | | | | | | | | | Prettify all the things (part 8) See merge request gitlab-org/gitlab-ce!22258 | ||||
| * | Prettify additional modules (I through Z) | Mike Greiling | 2018-10-16 | 50 | -1051/+1330 |
| | | |||||
* | | Merge branch 'prettify-all-the-things-1' into 'master' | Fatih Acet | 2018-10-16 | 76 | -1029/+1138 |
|\ \ | | | | | | | | | | | | | Prettify all the things (part 1) See merge request gitlab-org/gitlab-ce!22248 | ||||
| * | | Prettify environments feature_highlight and filtered_search modules | Mike Greiling | 2018-10-16 | 22 | -405/+459 |
| | | | |||||
| * | | Prettify diff_notes diffs and droplab modules | Mike Greiling | 2018-10-16 | 18 | -136/+172 |
| | | | |||||
| * | | Prettify blob behaviors and cycle_analytics modules | Mike Greiling | 2018-10-16 | 36 | -488/+507 |
| |/ | |||||
* | | Merge branch '49740-share-frontend-configs-between-repos' into 'master' | Clement Ho | 2018-10-16 | 3 | -46/+19 |
|\ \ | | | | | | | | | | | | | | | | | | | Resolve "Share frontend configs between repos" Closes #49740 See merge request gitlab-org/gitlab-ce!22405 | ||||
| * | | Use @gitlab/eslint-config as base in eslintrc | Mike Greiling | 2018-10-16 | 3 | -46/+19 |
| | | | |||||
* | | | Merge branch '51712-no-promise-without-done-fail' into 'master' | Mike Greiling | 2018-10-16 | 7 | -19/+17 |
|\ \ \ | |/ / |/| | | | | | | | | 2. enable jasmine/no-promise-without-done-fail See merge request gitlab-org/gitlab-ce!22231 | ||||
| * | | enable jasmine/no-promise-without-done-fail | Johann Hubert Sonntagbauer | 2018-10-16 | 7 | -19/+17 |
| | | | |||||
* | | | Merge branch 'fix-review-link-docs' into 'master' | Douwe Maan | 2018-10-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix "ready for review" link See merge request gitlab-org/gitlab-ce!22393 | ||||
| * | | | Fix "ready for review" link | Jan Provaznik | 2018-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Remove assignee_id=0 condition from search filters, we agreed that just presence of "ready of review" label is sufficient for filtering MRs, no need to unassign yourself. | ||||
* | | | | Merge branch 'sh-fix-commit-signatures-error' into 'master' | Douwe Maan | 2018-10-16 | 3 | -2/+24 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit signature error when project is disabled Closes #50903 See merge request gitlab-org/gitlab-ce!22344 | ||||
| * | | | | Fix commit signature error when project is disabled | Stan Hu | 2018-10-15 | 3 | -2/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is disabled, visiting the home page would show, "An error occurred while loading commit signatures". This change checks that the user has permission to view the project to avoid unnecessary GPG signature lookups. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50903 | ||||
* | | | | | Merge branch '52650-webhook-image-urls-rewritten-incorrectly-in-issues' into ↵ | Douwe Maan | 2018-10-16 | 6 | -55/+115 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Webhook Image URLs Rewritten Incorrectly in Issues" Closes #52650 See merge request gitlab-org/gitlab-ce!22361 | ||||
| * | | | | Web hook -> webhook | Sean McGivern | 2018-10-16 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Fix image webhook rewriting for uploads | Sean McGivern | 2018-10-16 | 6 | -53/+113 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This rewrote URLs to be absolute URLs. However, for uploads (the most common case), we actually need them to point to not just the GitLab instance, but the project they're from. Thankfully, we can normally get that information from the object we're building the hook for. | ||||
* | | | | | Merge branch 'prettify-all-the-things-6' into 'master' | Fatih Acet | 2018-10-16 | 49 | -1443/+1458 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Prettify all the things (part 6) See merge request gitlab-org/gitlab-ce!22256 | ||||
| * | | | | | Prettify vue_shared modules | Mike Greiling | 2018-10-10 | 28 | -925/+914 |
| | | | | | | |||||
| * | | | | | Prettify vue_merge_request_widget modules | Mike Greiling | 2018-10-10 | 22 | -520/+550 |
| | | | | | | |||||
* | | | | | | Merge branch '52147-loading-state' into 'master' | Mike Greiling | 2018-10-16 | 4 | -11/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes styling issues in test reports Closes #51386 and #52147 See merge request gitlab-org/gitlab-ce!22204 | ||||
| * | | | | | | Adds a `js-` class to allow for specs | Filipa Lacerda | 2018-10-11 | 2 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rspec was using a CSS class to check if the content was being rendered. Since the CSS has changed, the specs failed This commit replaces the CSS class with a `js-` prepended one to guarantee changing CSS won't break a pipeline | ||||
| * | | | | | | Fixes styling issues in test reports | Filipa Lacerda | 2018-10-11 | 3 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Merge Request widget, the reports for tests had an extra border. The loading icon in the mr widget used in all report sections had an extra margin causing text to be misaligned. This commit fixes both issues Closes #52147 | ||||
* | | | | | | | Merge branch '52686-project-slug-does-not-auto-populate-in-ie11' into 'master' | Mike Greiling | 2018-10-16 | 2 | -4/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project slug does not auto populate in IE11" Closes #52686 See merge request gitlab-org/gitlab-ce!22367 | ||||
| * | | | | | | | Use literal instead of constructor for creating regex | Martin Wortschack | 2018-10-15 | 2 | -4/+6 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'test-usage-ping-in-timeout-case' into 'master' | Robert Speicher | 2018-10-16 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Verify that usage ping works when all counts time out See merge request gitlab-org/gitlab-ce!22358 | ||||
| * | | | | | | | Verify that usage ping works when all counts time out | Sean McGivern | 2018-10-16 | 1 | -0/+7 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'qa-handle-sign-up-with-terms' into 'master' | Nick Thomas | 2018-10-16 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Handle sign-up when terms must be accepted See merge request gitlab-org/gitlab-ce!22374 | ||||
| * | | | | | | | | [QA] Handle sign-up when terms must be accepted | Rémy Coutable | 2018-10-15 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | | Merge branch '52477-add-iid-headers-to-emails' into 'master' | Sean McGivern | 2018-10-16 | 3 | -0/+23 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add IID headers to E-Mail notifications Closes #52477 See merge request gitlab-org/gitlab-ce!22263 | ||||
| * | | | | | | | | | Add IID headers to E-Mail notifications | Lukas Eipert | 2018-10-16 | 3 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These headers can be used to build URLs for API requests. Good examples would be Issues and Merge Requests |