Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | post merge pipeline and environments status | Alessio Caiazza | 2018-10-29 | 4 | -25/+95 |
| | |||||
* | Merge branch '52383-ui-filter-assignee-none-any' into 'master' | Sean McGivern | 2018-10-29 | 1 | -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 bar | Heinrich Lee Yu | 2018-10-26 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'prettify-all-the-things-4' into 'master' | Tim Zallmann | 2018-10-26 | 42 | -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-4 | Mike Greiling | 2018-10-26 | 302 | -4765/+6168 |
| |\ \ | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue | ||||
| * | | | Prettify sidebar modules | Mike Greiling | 2018-10-17 | 14 | -254/+258 |
| | | | | |||||
| * | | | Prettify registry and reports modules | Mike Greiling | 2018-10-17 | 15 | -291/+262 |
| | | | | |||||
| * | | | Prettify protected_branches and protected_tags modules | Mike Greiling | 2018-10-17 | 4 | -40/+68 |
| | | | | |||||
| * | | | Prettify performance_bar notes and profile modules | Mike Greiling | 2018-10-17 | 10 | -142/+134 |
| | | | | |||||
* | | | | Merge branch 'winh-split-merge-request-widget-dependencies' into 'master' | Mike Greiling | 2018-10-26 | 9 | -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-dependencies | Winnie Hellmann | 2018-10-25 | 9 | -83/+50 |
| | | | | | |||||
* | | | | | Resolve "No longer require a deploy to start Prometheus monitoring" | Peter Leitzen | 2018-10-26 | 1 | -2/+6 |
| | | | | | |||||
* | | | | | Update content of visible tooltips | Winnie Hellmann | 2018-10-26 | 1 | -0/+8 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch '52545-guest-create-issue-in-group-board' into 'master' | Sean McGivern | 2018-10-26 | 2 | -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 prop | Heinrich Lee Yu | 2018-10-26 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Fix project selector to show only projects with issues | Heinrich Lee Yu | 2018-10-26 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch '52115-Link-button-in-markdown-editor-should-recognize-URLs' ↵ | Phil Hughes | 2018-10-26 | 1 | -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 URLs | Johann Hubert Sonntagbauer | 2018-10-24 | 1 | -0/+17 |
| | | | | | |||||
* | | | | | Fix stage dropdown rendering only in English | Filipa Lacerda | 2018-10-26 | 4 | -10/+8 |
| | | | | | |||||
* | | | | | Merge branch 'remove-unnecessary-css' into 'master' | Phil Hughes | 2018-10-26 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | Remove .katex-display from selector See merge request gitlab-org/gitlab-ce!22580 | ||||
| * | | | | Remove .katex-display from selectorremove-unnecessary-css | Annabel Dunstone Gray | 2018-10-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch '40372-prometheus-dashboard-broken-on-firefox' into 'master' | Clement Ho | 2018-10-25 | 1 | -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-firefox | Adriel Santiago | 2018-10-24 | 1 | -2/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'winh-countdown-component' into 'master' | Clement Ho | 2018-10-25 | 2 | -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-component | Winnie Hellmann | 2018-10-25 | 1 | -4/+7 |
| | | | | | | | |||||
| * | | | | | | Add reusable component for counting down | Winnie Hellmann | 2018-10-25 | 1 | -0/+46 |
| | | | | | | | |||||
| * | | | | | | Add calculateRemainingMilliseconds() helper function | Winnie Hellmann | 2018-10-25 | 1 | -0/+12 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'prettify-all-the-things-3' into 'master' | Tim Zallmann | 2018-10-25 | 46 | -780/+1001 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | Prettify all the things (part 3) See merge request gitlab-org/gitlab-ce!22251 | ||||
| * | | | | | | Prettify app/assets/javascripts/pagesprettify-all-the-things-3 | Mike Greiling | 2018-10-17 | 46 | -780/+1001 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch '53055-combine-date-util-functions' into 'master' | Filipa Lacerda | 2018-10-25 | 9 | -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 disables | Kushal Pandya | 2018-10-25 | 3 | -150/+159 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formats the file to match Prettier rules Removes all blacklisted ESLint rules | ||||
| * | | | | | | Update pretty_time methods import path | Kushal Pandya | 2018-10-25 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates path for pretty time related methods to import from `datetime_utility.js` | ||||
| * | | | | | | Add pretty_time methods | Kushal Pandya | 2018-10-25 | 2 | -63/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds methods from `app/assets/javascripts/lib/utils/pretty_time.js` and deletes the file | ||||
| * | | | | | | Update pikaday method import path | Kushal Pandya | 2018-10-25 | 4 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates path for pikaday parsing methods to import from `datetime_utility.js` | ||||
| * | | | | | | Add pikaday parsing methods | Kushal Pandya | 2018-10-25 | 2 | -28/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds methods from `app/assets/javascripts/lib/utils/datefix.js` and deletes the files | ||||
| * | | | | | | Convert methods to ES6 exports | Kushal Pandya | 2018-10-25 | 1 | -39/+36 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'mr-diff-data' into 'master' | Filipa Lacerda | 2018-10-25 | 6 | -78/+78 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Impove diff discussion data See merge request gitlab-org/gitlab-ce!22491 | ||||
| * | | | | | | Update the state, not a param | Phil Hughes | 2018-10-25 | 3 | -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-data | Phil Hughes | 2018-10-24 | 6 | -76/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pre-request to https://gitlab.com/gitlab-org/gitlab-ce/issues/48956 | ||||
* | | | | | | | Move job stuck status to backend | Steve Azzopardi | 2018-10-25 | 3 | -20/+13 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Prettify all the things (part 7) | Mike Greiling | 2018-10-24 | 48 | -679/+826 |
| | | | | | | |||||
* | | | | | | Merge branch 'backport-ce-for-5781-operations-homepage-mvc-frontend' into ↵ | Annabel Dunstone Gray | 2018-10-24 | 1 | -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-frontend | Adriel Santiago | 2018-10-19 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7973 | ||||
* | | | | | | Merge branch 'fix/limit-flash-notice-width' into 'master' | Phil Hughes | 2018-10-24 | 1 | -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 layout | George Tsiolis | 2018-10-23 | 1 | -4/+5 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Add transparent background to markdown header tabs | George Tsiolis | 2018-10-24 | 1 | -0/+1 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge branch 'mr-file-list' into 'master' | Filipa Lacerda | 2018-10-24 | 3 | -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-list | Phil Hughes | 2018-10-23 | 2 | -2/+7 |
| | | | | | | |||||
| * | | | | | Changed list view tooltip | Phil Hughes | 2018-10-23 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Updated file tree icon | Phil Hughes | 2018-10-23 | 1 | -2/+2 |
| | | | | | |