summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* post merge pipeline and environments statusAlessio Caiazza2018-10-294-25/+95
|
* Merge branch '52383-ui-filter-assignee-none-any' into 'master'Sean McGivern2018-10-291-1/+6
|\ | | | | | | | | | | | | Add None/Any options for assignee in search bar Closes #52383 See merge request gitlab-org/gitlab-ce!22599
| * Add None/Any options for assignee in search barHeinrich Lee Yu2018-10-261-1/+6
| |
* | Merge branch 'prettify-all-the-things-4' into 'master'Tim Zallmann2018-10-2642-631/+626
|\ \ | | | | | | | | | | | | Prettify all the things (part 4) See merge request gitlab-org/gitlab-ce!22253
| * \ Merge branch 'master' into 'prettify-all-the-things-4'prettify-all-the-things-4Mike Greiling2018-10-26302-4765/+6168
| |\ \ | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
| * | | Prettify sidebar modulesMike Greiling2018-10-1714-254/+258
| | | |
| * | | Prettify registry and reports modulesMike Greiling2018-10-1715-291/+262
| | | |
| * | | Prettify protected_branches and protected_tags modulesMike Greiling2018-10-174-40/+68
| | | |
| * | | Prettify performance_bar notes and profile modulesMike Greiling2018-10-1710-142/+134
| | | |
* | | | Merge branch 'winh-split-merge-request-widget-dependencies' into 'master'Mike Greiling2018-10-269-83/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve circular dependencies in merge request widget See merge request gitlab-org/gitlab-ce!22605
| * | | | Resolve circular dependencies in merge request widgetwinh-split-merge-request-widget-dependenciesWinnie Hellmann2018-10-259-83/+50
| | | | |
* | | | | Resolve "No longer require a deploy to start Prometheus monitoring"Peter Leitzen2018-10-261-2/+6
| | | | |
* | | | | Update content of visible tooltipsWinnie Hellmann2018-10-261-0/+8
| |_|_|/ |/| | |
* | | | Merge branch '52545-guest-create-issue-in-group-board' into 'master'Sean McGivern2018-10-262-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve "Adding issues from group/project board is not allowed for project-level users" See merge request gitlab-org/gitlab-ce!22557
| * | | | Extract complex condition to computed propHeinrich Lee Yu2018-10-261-0/+3
| | | | |
| * | | | Fix project selector to show only projects with issuesHeinrich Lee Yu2018-10-261-1/+1
| | |_|/ | |/| |
* | | | Merge branch '52115-Link-button-in-markdown-editor-should-recognize-URLs' ↵Phil Hughes2018-10-261-0/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Link button in markdown editor recognize URLs Closes #52115 See merge request gitlab-org/gitlab-ce!22547
| * | | | Link button in markdown editor recognize URLsJohann Hubert Sonntagbauer2018-10-241-0/+17
| | | | |
* | | | | Fix stage dropdown rendering only in EnglishFilipa Lacerda2018-10-264-10/+8
| | | | |
* | | | | Merge branch 'remove-unnecessary-css' into 'master'Phil Hughes2018-10-261-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Remove .katex-display from selector See merge request gitlab-org/gitlab-ce!22580
| * | | | Remove .katex-display from selectorremove-unnecessary-cssAnnabel Dunstone Gray2018-10-241-1/+1
| | | | |
* | | | | Merge branch '40372-prometheus-dashboard-broken-on-firefox' into 'master'Clement Ho2018-10-251-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Prometheus dashboard broken on Firefox" Closes #40372 See merge request gitlab-org/gitlab-ce!22400
| * | | | | Fix prometheus graphs in firefox40372-prometheus-dashboard-broken-on-firefoxAdriel Santiago2018-10-241-2/+3
| | | | | |
* | | | | | Merge branch 'winh-countdown-component' into 'master'Clement Ho2018-10-252-0/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reusable component for counting down See merge request gitlab-org/gitlab-ce!22499
| * | | | | | Add validation for date strings passed to GlCountdownwinh-countdown-componentWinnie Hellmann2018-10-251-4/+7
| | | | | | |
| * | | | | | Add reusable component for counting downWinnie Hellmann2018-10-251-0/+46
| | | | | | |
| * | | | | | Add calculateRemainingMilliseconds() helper functionWinnie Hellmann2018-10-251-0/+12
| | | | | | |
* | | | | | | Merge branch 'prettify-all-the-things-3' into 'master'Tim Zallmann2018-10-2546-780/+1001
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Prettify all the things (part 3) See merge request gitlab-org/gitlab-ce!22251
| * | | | | | Prettify app/assets/javascripts/pagesprettify-all-the-things-3Mike Greiling2018-10-1746-780/+1001
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '53055-combine-date-util-functions' into 'master'Filipa Lacerda2018-10-259-218/+214
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combine all datetime library functions into `datetime_utility.js` This MR moves datetime methods from `app/assets/javascripts/lib/utils/pretty_time.js` & `app/assets/javascripts/lib/utils/datefix.js` into `app/assets/javascripts/lib/utils/datetime_utility.js`. Closes #53055 See merge request gitlab-org/gitlab-ce!22570
| * | | | | | Run through Prettier and remove ESLint disablesKushal Pandya2018-10-253-150/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formats the file to match Prettier rules Removes all blacklisted ESLint rules
| * | | | | | Update pretty_time methods import pathKushal Pandya2018-10-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates path for pretty time related methods to import from `datetime_utility.js`
| * | | | | | Add pretty_time methodsKushal Pandya2018-10-252-63/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds methods from `app/assets/javascripts/lib/utils/pretty_time.js` and deletes the file
| * | | | | | Update pikaday method import pathKushal Pandya2018-10-254-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates path for pikaday parsing methods to import from `datetime_utility.js`
| * | | | | | Add pikaday parsing methodsKushal Pandya2018-10-252-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds methods from `app/assets/javascripts/lib/utils/datefix.js` and deletes the files
| * | | | | | Convert methods to ES6 exportsKushal Pandya2018-10-251-39/+36
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mr-diff-data' into 'master'Filipa Lacerda2018-10-256-78/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Impove diff discussion data See merge request gitlab-org/gitlab-ce!22491
| * | | | | | Update the state, not a paramPhil Hughes2018-10-253-56/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed a bug where discussions wouldn't be assigned to a line when switching from discussion tab to changes tab
| * | | | | | Impove diff discussion datamr-diff-dataPhil Hughes2018-10-246-76/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pre-request to https://gitlab.com/gitlab-org/gitlab-ce/issues/48956
* | | | | | | Move job stuck status to backendSteve Azzopardi2018-10-253-20/+13
| |/ / / / / |/| | | | |
* | | | | | Prettify all the things (part 7)Mike Greiling2018-10-2448-679/+826
| | | | | |
* | | | | | Merge branch 'backport-ce-for-5781-operations-homepage-mvc-frontend' into ↵Annabel Dunstone Gray2018-10-241-0/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Backport scss changes for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7973 See merge request gitlab-org/gitlab-ce!22503
| * | | | | Backport scss changes for ee 7973backport-ce-for-5781-operations-homepage-mvc-frontendAdriel Santiago2018-10-191-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7973
* | | | | | Merge branch 'fix/limit-flash-notice-width' into 'master'Phil Hughes2018-10-241-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit flash notice width for fixed layout and improve spacing for fluid layout Closes #32868 See merge request gitlab-org/gitlab-ce!16482
| * | | | | | Limit flash notice width on fixed and fluid layoutGeorge Tsiolis2018-10-231-4/+5
| | |_|_|/ / | |/| | | |
* | | | | | Add transparent background to markdown header tabsGeorge Tsiolis2018-10-241-0/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'mr-file-list' into 'master'Filipa Lacerda2018-10-243-24/+140
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add list mode to file browser in diffs Closes #51859 See merge request gitlab-org/gitlab-ce!22191
| * | | | | Use convertPermissionToBoolean to get a booleanmr-file-listPhil Hughes2018-10-232-2/+7
| | | | | |
| * | | | | Changed list view tooltipPhil Hughes2018-10-231-2/+2
| | | | | |
| * | | | | Updated file tree iconPhil Hughes2018-10-231-2/+2
| | | | | |