summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Remove gitlab-ui's tooltip from globalClement Ho2018-11-054-4/+13
* Fix pipeline schedule style issuesScott Hampton2018-11-052-4/+10
* Merge branch 'gt-update-project-and-group-labels-empty-state' into 'master'Annabel Dunstone Gray2018-11-051-0/+1
|\
| * Remove empty state button margin on small viewportsGeorge Tsiolis2018-11-031-0/+1
* | 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-054-47/+53
|\ \
| * | Fix bad merge in app/assets/javascripts/environments/components/environment_i...scheduled-manual-jobs-environment-play-buttonsWinnie Hellmann2018-11-051-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-22354-6420/+7295
| |\ \
| * | | Make frontend files prettierWinnie Hellmann2018-10-152-2/+7
| * | | 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 scheduled-manual-jobs-e...Winnie Hellmann2018-10-09121-399/+1187
| |\ \ \
| * | | | Display scheduled job actions on environments listWinnie Hellmann2018-10-083-43/+45
* | | | | Merge branch 'qa-batch-comments-e2e-tests' into 'master'Nick Thomas2018-11-055-6/+6
|\ \ \ \ \
| * | | | | 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-0511-50/+69
|\ \ \ \ \ \
| * | | | | | Uses gitlab-ui components in jobs components.51259-ci-cd-gitlab-uiFilipa Lacerda2018-11-0211-50/+69
* | | | | | | Merge branch 'toggle-sidebar-alignment' into 'master'Phil Hughes2018-11-052-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Align toggle sidebar button across all browsers and OSstoggle-sidebar-alignmentAnnabel Dunstone Gray2018-11-022-2/+3
| |/ / / / / /
* | | | | | | Merge branch '51620-cannot-add-label-to-issue-from-board' into 'master'Douwe Maan2018-11-022-1/+2
|\ \ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | Merge branch 'top_level_clusters_controller' into 'master'Kamil Trzciński2018-11-021-5/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve controller sharing concernThong Kuah2018-11-018-21/+14
| * | | | | | | | Convert clusters to use a top-level controllerThong Kuah2018-11-018-14/+16
* | | | | | | | | Merge branch '28249-add-pagination' into 'master'Kamil Trzciński2018-11-024-40/+64
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | 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-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 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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-017-9/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix typos in comments and specsGeorge Tsiolis2018-11-017-9/+9
* | | | | | | | | Merge branch 'prettify-all-remaining-things' into 'master'Filipa Lacerda2018-10-3162-1593/+1797
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix eslint violationsMike Greiling2018-10-311-1/+1
| * | | | | | | | | Prettify remaining files with differences in CE and EEMike Greiling2018-10-3162-1592/+1796
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'leipert-migrate-gitlab-svgs' into 'master'Mike Greiling2018-10-312-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgsleipert-migrate-gitlab-svgsLukas Eipert2018-10-312-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'gt-fix-quick-links-button-styles' into 'master'Annabel Dunstone Gray2018-10-311-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |