summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into ide-jobs-list-componentside-jobs-list-componentsPhil Hughes2018-05-3123-171/+126
|\
| * Merge branch 'master' into 46971-extra-whitespaceFilipa Lacerda2018-05-3120-169/+122
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (32 commits) Update CHANGELOG.md for 10.8.3 Update "col-xs" usage to bootstrap4 Add missing usage_ping_enabled to API settings Make Repository#blob_data_at a public method Fix UI broken in line profiling modal due to Bootstrap 4 Only preload member records for the relevant projects/groups/user in projects API Fix   after sign-in with Google button Fix a wrong link reference in docs Simplify spec: `2.times.each` -> `2.times` Replace grape-route-helpers with our own grape-path-helpers Add archived param to the json response Consider we might have prefix for stable branches Convert spec/javascripts/.eslintrc to yml format as well Remove version lock on awesome_print dependency Fix import project by url layout Fix missing timeout value in object storage pre-authorization call fix last lints disable no-multi-assign fix `spaced-comment` remove unused createComponentWithMixin from vue spec helpers ...
| | * Update "col-xs" usage to bootstrap4Paul Slaughter2018-05-301-2/+2
| | |
| | * Merge branch 'leipert-upgrade-eslint' into 'master'Mike Greiling2018-05-3018-161/+120
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade eslint 3 -> 4 Closes #40476 See merge request gitlab-org/gitlab-ce!19182
| | | * fix `spaced-comment`Lukas Eipert2018-05-297-12/+14
| | | |
| | | * fix `no-unused-vars`Lukas Eipert2018-05-2911-152/+109
| | | |
| | | * Upgrade to eslint `~4.12.1` which is the last known version where the ↵Lukas Eipert2018-05-291-1/+1
| | | | | | | | | | | | | | | | camelcase bug does not persist
| | * | Merge branch '46999-line-profiling-modal-width' into 'master'Clement Ho2018-05-301-6/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Line profiling modal width Closes #46999 See merge request gitlab-org/gitlab-ce!19253
| | | * | Fix UI broken in line profiling modal due to Bootstrap 4Takuya Noguchi2018-05-311-6/+0
| | | |/
| * | | Remove whitespaceFilipa Lacerda2018-05-301-1/+1
| |/ /
| * | Merge branch 'sh-fix-submit-not-clearing-local-storage' into 'master'Filipa Lacerda2018-05-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix local storage not being cleared after creating a new issue Closes #37162 See merge request gitlab-org/gitlab-ce!19226
| | * | Fix local storage not being cleared after creating a new issueStan Hu2018-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating a new issue will always result in a 302 redirect to the newly-created issue. This reverts the change introduced in https://gitlab.com/gitlab-org/gitlab-ce/commit/7684217d6806408cd338260119364419260d1720 to handle the case where a user is in the middle of creating a new form and redirected to accepting the terms of service. Closes #37162
* | | | fixed jobs getting overwritten incorrectlyPhil Hughes2018-05-301-1/+1
| | | |
* | | | changed mutation to return new arrayPhil Hughes2018-05-303-15/+29
| | | | | | | | | | | | | | | | | | | | this makes the component completly unaware of the store, instead it emits events to the parent which knows about the store
* | | | changed mutations, update single object instead of returning new arrayPhil Hughes2018-05-305-38/+39
| | | | | | | | | | | | | | | | bunch of i18n stuff :see_no_evil:
* | | | Merge branch 'master' into ide-jobs-list-componentsPhil Hughes2018-05-3021-69/+134
|\ \ \ \ | |/ / /
| * | | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-303-18/+78
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Squash and merge in GitLab Core (CE)" Closes #34591 See merge request gitlab-org/gitlab-ce!18956
| | * | | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-293-18/+78
| | | | |
| * | | | Merge branch 'bootstrap-pull-float' into 'master'Annabel Gray2018-05-303-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert remaining pull-* to float-* Closes #46934 See merge request gitlab-org/gitlab-ce!19225
| | * | | | Convert remaining pull-* to float-*Clement Ho2018-05-293-5/+5
| | | | | |
| * | | | | Merge branch '46877-bootstrap-4-lists' into 'master'Clement Ho2018-05-301-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""well-list" is removed from Bootstrap 4" Closes #46877 See merge request gitlab-org/gitlab-ce!19207
| | * | | | | Replace well-list with content-list and hover-listAnnabel Dunstone Gray2018-05-291-1/+1
| | | | | | |
| * | | | | | Merge branch 'bootstrap-emails-verify-badge' into 'master'Annabel Gray2018-05-301-1/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix email verification badge Closes #46818 See merge request gitlab-org/gitlab-ce!19217
| | * | | | | Fix email verification badgeClement Ho2018-05-291-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'bootstrap-ide-new-file-modal' into 'master'Annabel Gray2018-05-292-18/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix web IDE new entry modal form alignment Closes #46933 See merge request gitlab-org/gitlab-ce!19210
| | * | | | Fix web IDE new entry modal form alignmentClement Ho2018-05-292-18/+12
| | | |_|/ | | |/| |
| * | | | Merge branch 'bootstrap-help-block' into 'master'Annabel Gray2018-05-299-11/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace help-block with form-text.text-muted Closes #46745 See merge request gitlab-org/gitlab-ce!19206
| | * | | | Replace help-block with form-text.text-mutedClement Ho2018-05-299-11/+11
| | |/ / /
| * | | | Auto wrap job logsClement Ho2018-05-291-0/+4
| |/ / /
| * | | Merge branch 'branches-fixes' into 'master'Clement Ho2018-05-291-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fix branches panel at smaller screen sizes See merge request gitlab-org/gitlab-ce!19157
| | * | | Fix branches panel at smaller screen sizesbranches-fixesAnnabel Dunstone Gray2018-05-251-0/+4
| | | | |
| * | | | Resolve "Merge request spinner spins forever after loading the diff"Lukas Eipert2018-05-292-15/+18
| | |/ / | |/| |
* | | | fixed failing specsPhil Hughes2018-05-301-1/+1
| | | | | | | | | | | | | | | | fixed merge requests not loading
* | | | removed style from components & moved to repo.scssPhil Hughes2018-05-295-92/+98
| | | |
* | | | more store testsPhil Hughes2018-05-291-1/+1
| | | |
* | | | Merge branch 'master' into ide-jobs-list-componentsPhil Hughes2018-05-2922-53/+988
|\ \ \ \ | |/ / /
| * | | Merge branch ↵Kamil Trzciński2018-05-2918-5/+909
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster' into 'master' Resolve "Fetch available parameters directly from GKE when creating a cluster" Closes #38759 See merge request gitlab-org/gitlab-ce!17806
| | * | | overhaul dropdown-dependent statesDennis Tang2018-05-287-31/+59
| | | | |
| | * | | Merge remote-tracking branch 'origin/master' into ↵Dennis Tang2018-05-25246-1806/+2108
| | |\ \ \ | | | | | | | | | | | | | | | | | | 38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster
| | * | | | update project invalid billing status error messageDennis Tang2018-05-231-1/+1
| | | | | |
| | * | | | remove duplicate propertyDennis Tang2018-05-231-5/+0
| | | | | |
| | * | | | match state function convention in badgesDennis Tang2018-05-232-5/+3
| | | | | |
| | * | | | Merge branch ↵Dennis Tang2018-05-231-0/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster' of gitlab.com:gitlab-org/gitlab-ce into 38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster # Conflicts: # app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue # app/assets/javascripts/projects/gke_cluster_dropdowns/index.js
| | | * | | | validate project billing status after selectionDennis Tang2018-05-239-32/+110
| | | | | | |
| | * | | | | fix testsDennis Tang2018-05-232-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | each suite needs its own instance of the store, but the state has to be returned via a factory otherwise the suites all share the same reference to one state object
| | * | | | | validate project billing status after selectionDennis Tang2018-05-239-33/+111
| | |/ / / /
| | * | | | rename vuex actions as per best practicesDennis Tang2018-05-144-21/+21
| | | | | |
| | * | | | move state into separate file as per vuex docsDennis Tang2018-05-142-11/+13
| | | | | |
| | * | | | eslint!Dennis Tang2018-05-111-2/+0
| | | | | |
| | * | | | move errors next to input fieldsDennis Tang2018-05-115-112/+128
| | | | | |
View Lorry Controller Status