Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'scheduled-manual-jobs-environment-play-buttons' into 'master' | Tim Zallmann | 2018-11-05 | 15 | -92/+309 |
|\ | | | | | | | | | | | | | Add the Play button for delayed jobs in environment page Closes #52129 See merge request gitlab-org/gitlab-ce!22106 | ||||
| * | Fix bad merge in ↵scheduled-manual-jobs-environment-play-buttons | Winnie Hellmann | 2018-11-05 | 1 | -1/+1 |
| | | | | | | | | app/assets/javascripts/environments/components/environment_item.vue | ||||
| * | Add scheduled_actions to JSON schema | Winnie Hellmann | 2018-10-24 | 1 | -0/+4 |
| | | |||||
| * | Update translations in locale/gitlab.pot | Winnie Hellmann | 2018-10-24 | 1 | -1/+1 |
| | | |||||
| * | Use secondary text color for delayed job timer | Winnie Hellmann | 2018-10-22 | 1 | -1/+4 |
| | | |||||
| * | Add permission check for delayed job actions | Winnie Hellmann | 2018-10-22 | 1 | -6/+2 |
| | | |||||
| * | Update confirmation modal text for starting delayed jobs immediately | Winnie Hellmann | 2018-10-22 | 2 | -2/+2 |
| | | |||||
| * | Merge branch 'master' into scheduled-manual-jobs-environment-play-buttons | Winnie Hellmann | 2018-10-22 | 2003 | -20531/+164530 |
| |\ | | | | | | | | | | | | | Conflicts: spec/javascripts/environments/environment_actions_spec.js | ||||
| * | | Add spec for Deployment#scheduled_actions | Shinya Maeda | 2018-10-18 | 1 | -1/+16 |
| | | | |||||
| * | | Make frontend files prettier | Winnie Hellmann | 2018-10-15 | 2 | -2/+7 |
| | | | |||||
| * | | Use regex for the extecped time | Shinya Maeda | 2018-10-12 | 1 | -2/+1 |
| | | | |||||
| * | | Improve deployment entity spec | Shinya Maeda | 2018-10-12 | 1 | -4/+4 |
| | | | |||||
| * | | Add changelog | Shinya Maeda | 2018-10-10 | 1 | -0/+5 |
| | | | |||||
| * | | Fix and add spec | Shinya Maeda | 2018-10-10 | 3 | -2/+67 |
| | | | |||||
| * | | Fix issue URL of TODO in environment_actions.vue | Winnie Hellmann | 2018-10-09 | 1 | -1/+1 |
| | | | |||||
| * | | Add feature flags for scheduled jobs in environments list | Winnie Hellmann | 2018-10-09 | 2 | -3/+67 |
| | | | |||||
| * | | Add component test for scheduled jobs in environments actions component | Winnie Hellmann | 2018-10-09 | 1 | -34/+88 |
| | | | |||||
| * | | Merge remote-tracking branch 'gitlab.com/master' into ↵ | Winnie Hellmann | 2018-10-09 | 753 | -3382/+8795 |
| |\ \ | | | | | | | | | | | | | scheduled-manual-jobs-environment-play-buttons | ||||
| * | | | Display scheduled job actions on environments list | Winnie Hellmann | 2018-10-08 | 3 | -43/+45 |
| | | | | |||||
| * | | | Add scheduled actions in deployment entity | Shinya Maeda | 2018-10-04 | 3 | -2/+11 |
| | | | | |||||
* | | | | Merge branch 'qa-batch-comments-e2e-tests' into 'master' | Nick Thomas | 2018-11-05 | 7 | -8/+65 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | QA Selectors for Batch Comment E2E Automation See merge request gitlab-org/gitlab-ce!22681 | ||||
| * | | | | removing duplicate definitionsqa-batch-comments-e2e-tests | at.ramya | 2018-10-31 | 1 | -27/+1 |
| | | | | | |||||
| * | | | | Updating selectors for diff line | at.ramya | 2018-10-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Adding methods | at.ramya | 2018-10-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | QA Selectors for Batch Comment E2E Automation | at.ramya | 2018-10-30 | 2 | -1/+27 |
| | | | | | |||||
| * | | | | Updating selectors for diff line | at.ramya | 2018-10-30 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Adding methods | at.ramya | 2018-10-30 | 1 | -1/+32 |
| | | | | | |||||
| * | | | | QA Selectors for Batch Comment E2E Automation | at.ramya | 2018-10-30 | 7 | -8/+34 |
| | | | | | |||||
* | | | | | Merge branch 'fast_project_blob_path' into 'master' | Douwe Maan | 2018-11-05 | 10 | -46/+98 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of tree rendering in repositories with a lot of items See merge request gitlab-org/gitlab-ce!16511 | ||||
| * | | | | | Improve performance of tree rendering in repositories with lots of items | Drew Blessing | 2018-10-31 | 10 | -46/+98 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails is slow to generate paths dynamically especially when called hundreds/thousands of times. Also, rendering many partials hundreds of times can be slower. This change reduces the number of partials rendered and introduces two fast path methods to speed up path generation. | ||||
* | | | | | | Merge branch 'docs/gitlab-pages-permissions' into 'master' | Nick Thomas | 2018-11-05 | 1 | -2/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add access controlled pages entry to permissions table See merge request gitlab-org/gitlab-ce!22798 | ||||
| * | | | | | | Add access controlled pages entry to permissions tabledocs/gitlab-pages-permissions | Evan Read | 2018-11-05 | 1 | -2/+3 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'ml-create-user-via-api-qa' into 'master' | Grzegorz Bizon | 2018-11-05 | 6 | -42/+89 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create users via the API See merge request gitlab-org/gitlab-ce!22779 | ||||
| * | | | | | | | Create users via the APIml-create-user-via-api-qa | Mark Lapierre | 2018-11-02 | 6 | -42/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows users to be fetched/created via the API. | ||||
* | | | | | | | | Merge branch '53450-wrong-value-for-kubernetes_version-variable' into 'master' | Kamil Trzciński | 2018-11-05 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump KUBERNETES_VERSION to latest 1.10 series Closes #53450 See merge request gitlab-org/gitlab-ce!22757 | ||||
| * | | | | | | | | Bump KUBERNETES_VERSION to latest 1.10 series53450-wrong-value-for-kubernetes_version-variable | Thong Kuah | 2018-11-04 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to use a kubectl binary that should be able to connect to Kubernetes clusters v1.9 and up. | ||||
* | | | | | | | | | Merge branch 'frozen-string-enable-lib-gitlab-ci-remain' into 'master' | Grzegorz Bizon | 2018-11-05 | 47 | -8/+105 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string for lib/gitlab/ci/**/*.rb See merge request gitlab-org/gitlab-ce!22703 | ||||
| * | | | | | | | | | Enable frozen string for lib/gitlab/ci/**/*.rb | gfyoung | 2018-10-30 | 47 | -8/+105 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for all remaining files in lib/gitlab/ci. Partially addresses #47424. | ||||
* | | | | | | | | | | Merge branch '51259-ci-cd-gitlab-ui' into 'master' | Phil Hughes | 2018-11-05 | 12 | -50/+74 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses gitlab-ui components in jobs components. See merge request gitlab-org/gitlab-ce!22780 | ||||
| * | | | | | | | | | | Uses gitlab-ui components in jobs components.51259-ci-cd-gitlab-ui | Filipa Lacerda | 2018-11-02 | 12 | -50/+74 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes old buttons,links and tooltips and uses the new gitlab-ui components. | ||||
* | | | | | | | | | | | Merge branch 'toggle-sidebar-alignment' into 'master' | Phil Hughes | 2018-11-05 | 3 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align toggle sidebar button across all browsers and OSs See merge request gitlab-org/gitlab-ce!22771 | ||||
| * | | | | | | | | | | Align toggle sidebar button across all browsers and OSstoggle-sidebar-alignment | Annabel Dunstone Gray | 2018-11-02 | 3 | -2/+8 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Update CHANGELOG.md for 11.4.5 | GitLab Release Tools Bot | 2018-11-04 | 3 | -10/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | | | | Merge branch 'update-def-of-done-with-qa-tests-requirement' into 'master' | Evan Read | 2018-11-04 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs - Update definition of done with e2e tests requirement Closes gitlab-org/quality/team-tasks#67 See merge request gitlab-org/gitlab-ce!22655 | ||||
| * | | | | | | | | | | | Using inline links per review feedbackupdate-def-of-done-with-qa-tests-requirement | Sanad Liaquat | 2018-11-02 | 1 | -4/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Changed dev stage team to quality team | Sanad Liaquat | 2018-11-01 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Update definition of done with e2e tests requirement | Sanad Liaquat | 2018-10-29 | 1 | -0/+3 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'update_license_management_job' into 'master' | Kamil Trzciński | 2018-11-04 | 2 | -9/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update license_management job See merge request gitlab-org/gitlab-ce!22732 | ||||
| * | | | | | | | | | | | | Update license_management job | Philippe Lafoucrière | 2018-11-04 | 2 | -9/+7 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'patch-32' into 'master' | Evan Read | 2018-11-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mysql.md with correct anchor link to "how services are linked" See merge request gitlab-org/gitlab-ce!22739 |