Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jivl-fix-bar-char-transient-spec-failure' into 'master' | Filipa Lacerda | 2018-10-19 | 1 | -6/+0 |
|\ | | | | | | | | | | | | | Fix transient failure from the bar_chart.vue component Closes gitlab-ee#8062 See merge request gitlab-org/gitlab-ce!22495 | ||||
| * | Fix transient failure from the bar_chart.vue component | Jose Vargas | 2018-10-19 | 1 | -6/+0 |
| | | |||||
* | | Merge branch 'gt-remove-empty-spec-describe-blocks' into 'master' | Clement Ho | 2018-10-19 | 3 | -14/+0 |
|\ \ | |/ |/| | | | | | | | | | Remove empty spec describe blocks Closes #52842 See merge request gitlab-org/gitlab-ce!22451 | ||||
| * | Remove empty spec describe blocks | George Tsiolis | 2018-10-18 | 3 | -14/+0 |
| | | |||||
* | | Change markdown header tab anchor links to buttons | George Tsiolis | 2018-10-19 | 1 | -1/+1 |
| | | |||||
* | | Fixed merge request fill tree not respecting fluid width | Phil Hughes | 2018-10-19 | 1 | -0/+8 |
|/ | | | | | | | This fixes a bug where the merge request fill tree would not respect the users fluid width preference. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916 | ||||
* | Fixes broken test in master for ci status bagde | Filipa Lacerda | 2018-10-18 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into 'prettify-all-the-karma-specs' | Mike Greiling | 2018-10-17 | 1 | -0/+11 |
|\ | | | | | | | # Conflicts: # spec/javascripts/clusters/components/application_row_spec.js | ||||
| * | Merge branch ↵ | Mike Greiling | 2018-10-17 | 1 | -9/+34 |
| |\ | | | | | | | | | | | | | | | | | | | '7493-configuring-prometheus-alerts-causes-cluster-install-page-to-display-error-message' into 'master' Backport: Resolve "Configuring Prometheus alerts causes Cluster Install page to display error message" See merge request gitlab-org/gitlab-ce!22408 | ||||
| | * | Add missing state on the application row component | Jose Vargas | 2018-10-17 | 1 | -9/+34 |
| | | | | | | | | | | | | | | | | | | This fixes the application row component weird state when an `updating` status is fetched, this causes apps to show as uninstalled even though they are installed in the cluster. | ||||
* | | | Resolve eslint violations | Mike Greiling | 2018-10-17 | 31 | -40/+86 |
| | | | |||||
* | | | Remove superfluous IIFEs | Mike Greiling | 2018-10-17 | 3 | -256/+250 |
| | | | |||||
* | | | Prettify all spec files | Mike Greiling | 2018-10-17 | 285 | -4687/+5295 |
| | | | |||||
* | | | Prettify awards_handler_spec.js script | Mike Greiling | 2018-10-17 | 1 | -356/+335 |
|/ / | |||||
* | | Merge branch 'gt-update-environments-empty-state' into 'master' | Filipa Lacerda | 2018-10-17 | 2 | -4/+4 |
|\ \ | | | | | | | | | | | | | Update environments empty state See merge request gitlab-org/gitlab-ce!22297 | ||||
| * | | Update environments empty state | George Tsiolis | 2018-10-17 | 2 | -4/+4 |
| | | | |||||
* | | | Replace job with group in frontend components to be consistent with backend | Winnie Hellmann | 2018-10-17 | 3 | -21/+20 |
| | | | |||||
* | | | Resolve "Integrate new vue+vuex code base with new API and remove old haml code" | Filipa Lacerda | 2018-10-17 | 9 | -721/+791 |
|/ / | |||||
* | | enable jasmine/new-line-before-expect | Johann Hubert Sonntagbauer | 2018-10-17 | 220 | -108/+1149 |
| | | |||||
* | | enable jasmine/no-promise-without-done-fail | Johann Hubert Sonntagbauer | 2018-10-16 | 7 | -19/+17 |
|/ | |||||
* | Merge branch 'ide-file-templates-clear' into 'master' | Filipa Lacerda | 2018-10-16 | 1 | -0/+8 |
|\ | | | | | | | | | | | | | Fixed file templates not clearing in Web IDE Closes #52487 See merge request gitlab-org/gitlab-ce!22357 | ||||
| * | Fixed file templates not clearing in Web IDE | Phil Hughes | 2018-10-15 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where the file templates would not be cleared after changing the template type. Previously the templates would get pushed into the array creating a list of templates for the different types. This changes that by clearing the templates array when the template type gets changed. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52487 | ||||
* | | Replace `<i>` in vue components with `<icon>` | George Tsiolis | 2018-10-15 | 1 | -12/+2 |
| | | |||||
* | | Merge branch ↵ | Clement Ho | 2018-10-15 | 1 | -29/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '52532-unable-to-toggle-issuable-sidebar-out-of-collapsed-state' into 'master' Allow Issue and Merge Request sidebar to be toggled from collapsed state Closes #52532 See merge request gitlab-org/gitlab-ce!22353 | ||||
| * | | Remove unused eslint disable | Clement Ho | 2018-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | Remove obsolete usage of gl.lazyLoader.loadCheck | Lukas Eipert | 2018-10-15 | 1 | -28/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In [!21565][0] we removed the loadCheck function from the LazyLoader for images. The function seemed to be obsolete before anyhow, because we make use of the MutationObserver in order to detect elements added / removed from the DOM. [0]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21565 | ||||
* | | | Prioritize group settings, improve panel titles, disable submit without changes | Luke Bennett | 2018-10-15 | 6 | -7/+128 |
| |/ |/| | |||||
* | | Only display merge commit SHA when it exists | Mark Chao | 2018-10-15 | 1 | -0/+10 |
|/ | |||||
* | Merge branch '52614-update-job-started-check' into 'master' | Tim Zallmann | 2018-10-12 | 1 | -5/+5 |
|\ | | | | | | | | | Updates the check for started in job header See merge request gitlab-org/gitlab-ce!22329 | ||||
| * | Updates the check for started in job header | Filipa Lacerda | 2018-10-12 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | The function that was checking if the job was started or not was expecting a boolean, however it was receiving a null. During the refactor the condition was changed, causing the function to break with null This commit fixes the check | ||||
* | | Add stage name in job.json response | Steve Azzopardi | 2018-10-12 | 4 | -27/+37 |
|/ | |||||
* | Fix broken file name navigation on MRs | Jacques Erasmus | 2018-10-11 | 1 | -3/+12 |
| | |||||
* | Merge branch '51712-prefer-jasmine-matcher' into 'master' | Mike Greiling | 2018-10-11 | 18 | -45/+42 |
|\ | | | | | | | | | 4. enable jasmine/prefer-jasmine-matcher See merge request gitlab-org/gitlab-ce!22236 | ||||
| * | enable jasmine/prefer-jasmine-matcher | Johann Hubert Sonntagbauer | 2018-10-09 | 18 | -45/+42 |
| | | |||||
* | | Merge branch '51712-new-line-between-declarations' into 'master' | Mike Greiling | 2018-10-11 | 15 | -1/+115 |
|\ \ | | | | | | | | | | | | | 1. enable jasmine/new-line-between-declarations See merge request gitlab-org/gitlab-ce!22230 | ||||
| * | | enable jasmine/new-line-between-declarations | Johann Hubert Sonntagbauer | 2018-10-09 | 15 | -1/+115 |
| |/ | |||||
* | | Fix erased block not being rendered when job was erased | Filipa Lacerda | 2018-10-11 | 1 | -4/+3 |
| | | |||||
* | | Merge branch '52472-pipeline-endpoint-json' into 'master' | Tim Zallmann | 2018-10-11 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | Adds `.json` to the end of pipelines endpoint Closes #52472 See merge request gitlab-org/gitlab-ce!22293 | ||||
| * | | Adds `.json` to the end of pipelines endpoint | Filipa Lacerda | 2018-10-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | When the job page is rendered we fetch the pipeline endpoint to render the stages in the sidebar. Without `.json` the response is cached, and when the user goes back to the pipeline's page it renders the json output instead of the Vue app | ||||
* | | | Stuck block URL links to runners settings | Filipa Lacerda | 2018-10-11 | 1 | -1/+1 |
|/ / | |||||
* | | Convert remaining issue board components into ES module syntax | Mike Greiling | 2018-10-10 | 10 | -88/+87 |
|/ | |||||
* | Resolve "Harmonize prettier and eslint configs" | Mike Greiling | 2018-10-09 | 16 | -17/+14 |
| | |||||
* | Add button to insert table in markdown editor | George Tsiolis | 2018-10-06 | 1 | -2/+11 |
| | |||||
* | Fix LFS uploaded images not being rendered | Oswaldo Ferreira | 2018-10-05 | 3 | -6/+7 |
| | |||||
* | Merge branch 'ce-5987-project-templates-api' into 'master' | Robert Speicher | 2018-10-05 | 1 | -45/+19 |
|\ | | | | | | | | | Add a new project-specific templates API endpoint See merge request gitlab-org/gitlab-ce!22118 | ||||
| * | Backport project template API to CE | Nick Thomas | 2018-10-05 | 1 | -45/+19 |
| | | |||||
* | | Merge branch 'scheduled-manual-jobs' into 'master' | Kamil Trzciński | 2018-10-05 | 3 | -32/+104 |
|\ \ | | | | | | | | | | | | | | | | | | | Delayed jobs Closes #51352 See merge request gitlab-org/gitlab-ce!21767 | ||||
| * \ | Merge branch 'master-ce' into scheduled-manual-jobs | Shinya Maeda | 2018-10-05 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| * | | Make sure remaining time of scheduled jobs is positive in pipelines list | Winnie Hellmann | 2018-10-05 | 1 | -5/+20 |
| | | | |||||
| * | | Merge branch 'master-ce' into scheduled-manual-jobs | Shinya Maeda | 2018-10-05 | 10 | -57/+294 |
| |\ \ |