summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Polyfills sticky position within a watcher53535-sticky-archivedFilipa Lacerda2018-11-061-11/+8
|
* [ci skip] Renders a warning block for archieved jobFilipa Lacerda2018-11-052-3/+28
| | | | | When the job is archieved we render a affixed warning on the top of the job log
* Add 'only history' option to notes filterFelipe Artur2018-11-059-6/+37
|
* Merge branch 'scheduled-manual-jobs-environment-play-buttons' into 'master'Tim Zallmann2018-11-053-41/+52
|\ | | | | | | | | | | | | 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
| * 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-22331-6378/+7178
| |\ | | | | | | | | | | | | Conflicts: spec/javascripts/environments/environment_actions_spec.js
| * | Make frontend files prettierWinnie Hellmann2018-10-151-1/+6
| | |
| * | 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-091-1/+1
| | |
| * | Merge remote-tracking branch 'gitlab.com/master' into ↵Winnie Hellmann2018-10-09109-321/+1054
| |\ \ | | | | | | | | | | | | scheduled-manual-jobs-environment-play-buttons
| * | | Display scheduled job actions on environments listWinnie Hellmann2018-10-082-38/+45
| | | |
* | | | Merge branch 'qa-batch-comments-e2e-tests' into 'master'Nick Thomas2018-11-055-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | QA Selectors for Batch Comment E2E Automation See merge request gitlab-org/gitlab-ce!22681
| * | | | Updating selectors for diff lineat.ramya2018-10-301-1/+1
| | | | |
| * | | | QA Selectors for Batch Comment E2E Automationat.ramya2018-10-301-1/+1
| | | | |
| * | | | Updating selectors for diff lineat.ramya2018-10-302-2/+2
| | | | |
| * | | | QA Selectors for Batch Comment E2E Automationat.ramya2018-10-305-6/+6
| | | | |
* | | | | Merge branch '51259-ci-cd-gitlab-ui' into 'master'Phil Hughes2018-11-059-47/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-029-47/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes old buttons,links and tooltips and uses the new gitlab-ui components.
* | | | | | Merge branch '51620-cannot-add-label-to-issue-from-board' into 'master'Douwe Maan2018-11-022-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cannot add label to issue from board Closes #51620 See merge request gitlab-org/gitlab-ce!22475
| * | | | | | Rename to assignable_labels_endpoint51620-cannot-add-label-to-issue-from-boardBrett Walker2018-10-311-1/+1
| | | | | | |
| * | | | | | Dynamically store the valid label endpointBrett Walker2018-10-312-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to ensure we have the right endpoint to query for an issue's possible valid labels, we store that url in the issue object that gets passed to the frontend.
* | | | | | | Merge branch 'top_level_clusters_controller' into 'master'Kamil Trzciński2018-11-021-5/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Top level clusters controller See merge request gitlab-org/gitlab-ce!22438
| * | | | | | | Resolve controller sharing concernThong Kuah2018-11-018-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ClustersController as base while having Projects::ClustersController to inform what `clusterable` is. Thanks @ayufan for the great suggestion ! - View changes to work with new approach - Fix javascript for new approach - Fix feature specs for new approach - Fix QA
| * | | | | | | Convert clusters to use a top-level controllerThong Kuah2018-11-018-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation so that we can create both cluster attached to project and cluster attached to group. - Move ClustersController to top level - Move Clusters::ApplicationsController to top-level too - Creates a Clusters::BaseController to share common functions - Do not rely on @project ivar. Anything could set the ivar. - Fix Vue page components due to new data-page value Because of the controller change we have gone from `projects:clusters:new` to `clusters:new`, so we need to update the file location of the page components. There is somewhere a function that will convert data-page to a file location. On that note, projects/clusters/gcp/new/, translate to Projects::Clusters::Gcp#new doesn't exist so replace that with clusters/create_gcp/ and clusters/create_user/
* | | | | | | | Merge branch '28249-add-pagination' into 'master'Kamil Trzciński2018-11-024-40/+64
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds pagination to pipelines table in merge request & commit page Closes #28249 See merge request gitlab-org/gitlab-ce!22696
| * | | | | | | Adds pagination to pipelines table in merge request page28249-add-paginationFilipa Lacerda2018-10-314-40/+64
| | | | | | | |
* | | | | | | | Remove gitlab-ui's progress bar from globalClement Ho2018-11-022-2/+5
| | | | | | | |
* | | | | | | | Merge branch 'replace-tooltip-in-markdown-component' into 'master'Clement Ho2018-11-012-10/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace tooltip in markdown component with gl-tooltip See merge request gitlab-org/gitlab-ce!21989
| * | | | | | | | Replace tooltip in markdown component with gl-tooltipGeorge Tsiolis2018-10-312-10/+10
| |/ / / / / / /
* | | | | | | | Merge branch 'winh-job-list-dynamic-timer' into 'master'Clement Ho2018-11-011-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dynamic timer for delayed jobs in job list See merge request gitlab-org/gitlab-ce!22656
| * | | | | | | | Add dynamic timer for delayed jobs in job listwinh-job-list-dynamic-timerWinnie Hellmann2018-11-011-0/+16
| | | | | | | | |
* | | | | | | | | Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'Sean McGivern2018-11-011-0/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add None / Any options to search barHeinrich Lee Yu2018-11-011-0/+10
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '52382-filter-milestone-api-none-any' into 'master'Sean McGivern2018-11-011-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Filter by `None`/`Any` for milestone in issues/mrs API" Closes #52382 See merge request gitlab-org/gitlab-ce!22637
| * | | | | | | | Update search bar token for None and AnyHeinrich Lee Yu2018-11-011-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-016-7/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683
| * | | | | | | Fix typos in comments and specsGeorge Tsiolis2018-11-016-7/+7
| | | | | | | |
* | | | | | | | Merge branch 'prettify-all-remaining-things' into 'master'Filipa Lacerda2018-10-3162-1593/+1797
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify remaining files with differences in CE and EE See merge request gitlab-org/gitlab-ce!22702
| * | | | | | | | Fix eslint violationsMike Greiling2018-10-311-1/+1
| | | | | | | | |
| * | | | | | | | Prettify remaining files with differences in CE and EEMike Greiling2018-10-3162-1592/+1796
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgsleipert-migrate-gitlab-svgsLukas Eipert2018-10-312-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'gl-ui-pagination' into 'master'Phil Hughes2018-10-312-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitlab-ui's pagination from global See merge request gitlab-org/gitlab-ce!22704
| * | | | | | | Remove gitlab-ui's pagination from globalgl-ui-paginationClement Ho2018-10-302-2/+4
| | | | | | | |
* | | | | | | | Remove gitlab-ui's modal from globalClement Ho2018-10-313-8/+13
| | | | | | | |
* | | | | | | | Merge branch 'gt-fix-ide-typos-in-props' into 'master'Phil Hughes2018-10-314-7/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in IDE props See merge request gitlab-org/gitlab-ce!22685
| * | | | | | | | Fix typos in IDE propsGeorge Tsiolis2018-10-304-7/+7
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Adds required prop to the post merge pipeline53386-broken-masterFilipa Lacerda2018-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two different MRs updating the same code were merged and this was not caught prior to merge. This MR adds the missing prop to the post merge pipeline