summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'Douwe Maan2018-11-076-30/+8
|\
| * Comment on any expanded diff line on MRsOswaldo Ferreira2018-11-066-30/+8
* | Copy changes for abuse clarityJeremy Watson2018-11-071-3/+3
* | Merge branch 'winh-delayed-jobs-dynamic-timer' into 'master'Filipa Lacerda2018-11-074-10/+96
|\ \
| * | Revert jobs/components/job_container_item.vue from v-gl-tooltip to v-tooltip ...winh-delayed-jobs-dynamic-timerWinnie Hellmann2018-11-071-3/+4
| * | Run yarn prettier-all-saveWinnie Hellmann2018-11-071-1/+1
| * | Add dynamic timer for delayed jobs in job sidebarWinnie Hellmann2018-11-071-1/+11
| * | Add dynamic timer for delayed jobs in pipeline graphWinnie Hellmann2018-11-071-5/+16
| * | Add dynamic timer for delayed jobs on single job pageWinnie Hellmann2018-11-071-1/+15
| * | Add Vue mixin for delayed job timersWinnie Hellmann2018-11-071-0/+50
* | | Remove gitlab-ui loading icon from globalClement Ho2018-11-0752-6/+107
* | | Merge branch 'mr-image-commenting' into 'master'Filipa Lacerda2018-11-0723-170/+577
|\ \ \
| * | | Fixed user avatar link render empty spacemr-image-commentingPhil Hughes2018-11-071-2/+1
| * | | Restored width & height propertiesPhil Hughes2018-11-063-2/+30
| * | | Re-implemented image commenting on diffsPhil Hughes2018-11-0523-169/+549
* | | | Merge branch '53535-sticky-archived' into 'master'Phil Hughes2018-11-063-6/+48
|\ \ \ \ | |_|/ / |/| | |
| * | | Polyfills sticky position within a watcher53535-sticky-archivedFilipa Lacerda2018-11-061-11/+8
| * | | [ci skip] Renders a warning block for archieved jobFilipa Lacerda2018-11-053-3/+48
* | | | Disable stop environment button while deployment is runningFilipa Lacerda2018-11-061-7/+23
* | | | Resolve "Redesign activity feed"Martin Wortschack2018-11-064-37/+56
* | | | Merge branch '7737-ci-pipeline-view-slowed-down-massivly-if-security-tabs-has...Phil Hughes2018-11-063-65/+106
|\ \ \ \
| * | | | Improve performance of rendering large reports7737-ci-pipeline-view-slowed-down-massivly-if-security-tabs-has-many-entriesLukas Eipert2018-11-063-65/+106
* | | | | Renders unescaped `sprinft` stringFilipa Lacerda2018-11-061-0/+1
* | | | | Fix save button not activating when original setting started as nullStan Hu2018-11-061-1/+2
|/ / / /
* | | | 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
|\ \ \ \ \ \ \ \
View Lorry Controller Status