summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add license approvals for vue-loaderadd-vue-loaderMike Greiling2017-04-091-0/+30
|
* fix closing tags of async_button componentMike Greiling2017-04-091-4/+5
|
* add CHANGELOG.md entry for !10517Mike Greiling2017-04-091-0/+4
|
* add eslint support to vue filesMike Greiling2017-04-093-4/+56
|
* convert pipeline async_button component to vue templateMike Greiling2017-04-093-25/+27
|
* convert pipeline error state to vue templateMike Greiling2017-04-095-22/+24
|
* convert pipeline empty state to vue templateMike Greiling2017-04-095-36/+37
|
* update Vue to match vue-template-compilerMike Greiling2017-04-092-4/+4
|
* clean up webpack configMike Greiling2017-04-091-5/+6
|
* add vue-loader dependencies and basic configMike Greiling2017-04-093-17/+750
|
* Merge branch 'remove_is_admin' into 'master' Robert Speicher2017-04-0924-40/+40
|\ | | | | | | | | | | | | Remove the `User#is_admin?` method Closes #30584 See merge request !10520
| * Remove the User#is_admin? methodblackst0ne2017-04-0924-40/+40
| |
* | Merge branch 'add-field-for-group-name' into 'master' Alfredo Sumaran2017-04-0912-23/+88
|\ \ | |/ |/| | | | | Add a name field to the group edit form See merge request !10502
| * Add a name field to the group edit formadd-field-for-group-nameDouglas Lovell2017-04-0912-23/+88
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables user specification of group name vs. name inferred from group path. Cause new group form to copy name from path Adds some new page-specific javascript that copies entry from the group path field to the group name field when the group name field is initially empty. Remove duplicate group name entry field on group edit form This corrects the duplicated name entry field and tests that the JavaScript does not update the group name field if the user edits the group path. (Editing the group path is not recommended in any case, but it is possible.) Address eslint errors in group.js Enable group name copy with dispatch and explore group creation The dispatch and explore group creation forms require the group.js asset, and their tests now require testing against poltergeist Update workflow new group instruction Update the gitlab basics group creation document Add a change log entry Remove unused variable for eslint
* Merge branch 'new-resolvable-discussion' into 'master' Douwe Maan2017-04-08140-2225/+4037
|\ | | | | | | | | | | | | Add option to start a new resolvable discussion in an MR Closes #24378 See merge request !7527
| * Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-0738-697/+881
| |\
| * | Fix specsDouwe Maan2017-04-072-2/+2
| | |
| * | alfredo review changesLuke "Jared" Bennett2017-04-071-1/+1
| | |
| * | Revert yarn.lock changesLuke "Jared" Bennett2017-04-072-273/+2055
| | |
| * | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-07123-480/+1883
| |\ \
| * | | Rever yarn.lock changesLuke "Jared" Bennett2017-04-071-2075/+276
| | | |
| * | | Review changesLuke "Jared" Bennett2017-04-074-9/+34
| | | |
| * | | Fix firefox overflow css bugLuke "Jared" Bennett2017-04-071-0/+1
| | | |
| * | | Fix bug where commit comment would not show up in the right discussion on ↵Douwe Maan2017-04-072-11/+11
| | | | | | | | | | | | | | | | the MR page
| * | | Fix creating discussion when diff view is set to parallelDouwe Maan2017-04-072-27/+20
| | | |
| * | | Fix view specDouwe Maan2017-04-071-2/+2
| | | |
| * | | Update schema.rbDouwe Maan2017-04-071-1/+1
| | | |
| * | | Add link to list itemsLuke "Jared" Bennett2017-04-072-15/+28
| | | |
| * | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0767-309/+1225
| |\ \ \
| * | | | Added variable button fixLuke "Jared" Bennett2017-04-073-20/+38
| | | | |
| * | | | Fixed issue button state bugLuke "Jared" Bennett2017-04-075-80/+121
| | | | |
| * | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-07229-1046/+1847
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into update-droplab-to-webpack-versionupdate-droplab-to-webpack-versionLuke "Jared" Bennett2017-04-07466-2918/+9189
| | |\ \ \ \
| * | | | | | Fixed bugs and added testsLuke "Jared" Bennett2017-04-076-15/+33
| | | | | | |
| * | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-074-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Renamed spec filesLuke "Jared" Bennett2017-04-074-0/+0
| | | | | | |
| * | | | | | Finish up feature specLuke "Jared" Bennett2017-04-074-65/+63
| | | | | | |
| * | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-062-10/+80
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Update inputsetterLuke "Jared" Bennett2017-04-062-10/+80
| | | | | | |
| * | | | | | Further fixes for feature specLuke "Jared" Bennett2017-04-061-4/+6
| | | | | | |
| * | | | | | Update schema.rb versionDouwe Maan2017-04-061-1/+1
| | | | | | |
| * | | | | | Merge branch 'new-resolvable-discussion' of gitlab.com:gitlab-org/gitlab-ce ↵Luke "Jared" Bennett2017-04-06272-1879/+7349
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into new-resolvable-discussion
| | * \ \ \ \ \ Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-06272-1879/+7349
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml
| * | | | | | | | Further fixes for feature specLuke "Jared" Bennett2017-04-061-25/+30
| |/ / / / / / /
| * | | | | | | Merge branch 'new-resolvable-discussion' of gitlab.com:gitlab-org/gitlab-ce ↵Luke "Jared" Bennett2017-04-0618-69/+107
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into new-resolvable-discussion
| | * | | | | | | Refactor resolvability checks based on typeDouwe Maan2017-04-0617-67/+107
| | | | | | | | |
| | * | | | | | | Remove unnecesary styleAlfredo Sumaran2017-04-061-2/+0
| | | | | | | | |
| * | | | | | | | Fix feature specs, still some to be doneLuke "Jared" Bennett2017-04-061-13/+21
| |/ / / / / / /
| * | | | | | | Add feature specsLuke "Jared" Bennett2017-04-062-4/+246
| | | | | | | |
| * | | | | | | Correct dropdown widthLuke "Jared" Bennett2017-04-061-1/+1
| | | | | | | |
View Lorry Controller Status