summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'scheduled-manual-jobs-environment-play-buttons' into 'master'Tim Zallmann2018-11-0515-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-buttonsWinnie Hellmann2018-11-051-1/+1
| | | | | | | | app/assets/javascripts/environments/components/environment_item.vue
| * Add scheduled_actions to JSON schemaWinnie Hellmann2018-10-241-0/+4
| |
| * Update translations in locale/gitlab.potWinnie Hellmann2018-10-241-1/+1
| |
| * Use secondary text color for delayed job timerWinnie Hellmann2018-10-221-1/+4
| |
| * Add permission check for delayed job actionsWinnie Hellmann2018-10-221-6/+2
| |
| * Update confirmation modal text for starting delayed jobs immediatelyWinnie Hellmann2018-10-222-2/+2
| |
| * Merge branch 'master' into scheduled-manual-jobs-environment-play-buttonsWinnie Hellmann2018-10-222003-20531/+164530
| |\ | | | | | | | | | | | | Conflicts: spec/javascripts/environments/environment_actions_spec.js
| * | Add spec for Deployment#scheduled_actionsShinya Maeda2018-10-181-1/+16
| | |
| * | Make frontend files prettierWinnie Hellmann2018-10-152-2/+7
| | |
| * | Use regex for the extecped timeShinya Maeda2018-10-121-2/+1
| | |
| * | Improve deployment entity specShinya Maeda2018-10-121-4/+4
| | |
| * | Add changelogShinya Maeda2018-10-101-0/+5
| | |
| * | Fix and add specShinya Maeda2018-10-103-2/+67
| | |
| * | Fix issue URL of TODO in environment_actions.vueWinnie Hellmann2018-10-091-1/+1
| | |
| * | Add feature flags for scheduled jobs in environments listWinnie Hellmann2018-10-092-3/+67
| | |
| * | Add component test for scheduled jobs in environments actions componentWinnie Hellmann2018-10-091-34/+88
| | |
| * | Merge remote-tracking branch 'gitlab.com/master' into ↵Winnie Hellmann2018-10-09753-3382/+8795
| |\ \ | | | | | | | | | | | | scheduled-manual-jobs-environment-play-buttons
| * | | Display scheduled job actions on environments listWinnie Hellmann2018-10-083-43/+45
| | | |
| * | | Add scheduled actions in deployment entityShinya Maeda2018-10-043-2/+11
| | | |
* | | | Merge branch 'qa-batch-comments-e2e-tests' into 'master'Nick Thomas2018-11-057-8/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | QA Selectors for Batch Comment E2E Automation See merge request gitlab-org/gitlab-ce!22681
| * | | | removing duplicate definitionsqa-batch-comments-e2e-testsat.ramya2018-10-311-27/+1
| | | | |
| * | | | Updating selectors for diff lineat.ramya2018-10-301-1/+1
| | | | |
| * | | | Adding methodsat.ramya2018-10-301-1/+1
| | | | |
| * | | | QA Selectors for Batch Comment E2E Automationat.ramya2018-10-302-1/+27
| | | | |
| * | | | Updating selectors for diff lineat.ramya2018-10-302-2/+2
| | | | |
| * | | | Adding methodsat.ramya2018-10-301-1/+32
| | | | |
| * | | | QA Selectors for Batch Comment E2E Automationat.ramya2018-10-307-8/+34
| | | | |
* | | | | Merge branch 'fast_project_blob_path' into 'master'Douwe Maan2018-11-0510-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 itemsDrew Blessing2018-10-3110-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 Thomas2018-11-051-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-permissionsEvan Read2018-11-051-2/+3
| | | | | | |
* | | | | | | Merge branch 'ml-create-user-via-api-qa' into 'master'Grzegorz Bizon2018-11-056-42/+89
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create users via the API See merge request gitlab-org/gitlab-ce!22779
| * | | | | | | Create users via the APIml-create-user-via-api-qaMark Lapierre2018-11-026-42/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows users to be fetched/created via the API.
* | | | | | | | Merge branch '53450-wrong-value-for-kubernetes_version-variable' into 'master'Kamil Trzciński2018-11-052-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-variableThong Kuah2018-11-042-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 Bizon2018-11-0547-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/**/*.rbgfyoung2018-10-3047-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 Hughes2018-11-0512-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-uiFilipa Lacerda2018-11-0212-50/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes old buttons,links and tooltips and uses the new gitlab-ui components.
* | | | | | | | | | | Merge branch 'toggle-sidebar-alignment' into 'master'Phil Hughes2018-11-053-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-alignmentAnnabel Dunstone Gray2018-11-023-2/+8
| | | | | | | | | | |
* | | | | | | | | | | Update CHANGELOG.md for 11.4.5GitLab Release Tools Bot2018-11-043-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge branch 'update-def-of-done-with-qa-tests-requirement' into 'master'Evan Read2018-11-041-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-requirementSanad Liaquat2018-11-021-4/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Changed dev stage team to quality teamSanad Liaquat2018-11-011-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Update definition of done with e2e tests requirementSanad Liaquat2018-10-291-0/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'update_license_management_job' into 'master'Kamil Trzciński2018-11-042-9/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update license_management job See merge request gitlab-org/gitlab-ce!22732
| * | | | | | | | | | | | Update license_management jobPhilippe Lafoucrière2018-11-042-9/+7
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'patch-32' into 'master'Evan Read2018-11-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mysql.md with correct anchor link to "how services are linked" See merge request gitlab-org/gitlab-ce!22739