summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add new icon if resolved61024-update-resolved-iconJarek Ostrowski2019-05-294-3/+8
| | | | | | | | | | | | Remove unwanted change Add changelog Add check circle filled count widget Change color for consistency Remove resolve button class Merge master Change to single icon, conditional name Remove authorship Remove unnecessary added styles
* Merge branch 'qa-unquarantine-auto-devops' into 'master'Dan Davison2019-05-281-2/+1
|\ | | | | | | | | | | | | Un-quarantine Auto DevOps QA test Closes gitlab-org/quality/nightly#81 See merge request gitlab-org/gitlab-ce!28765
| * Un-quarantine Auto DevOps QA testun-quarantine-qa-auto-devopsqa-unquarantine-auto-devopsThong Kuah2019-05-271-2/+1
| |
* | Merge branch 'pipelines-email-default-branch-filter' into 'master'Mayra Cabrera2019-05-285-20/+86
|\ \ | | | | | | | | | | | | | | | | | | Add notify_only_default_branch option to PipelinesEmailService Closes #61721 See merge request gitlab-org/gitlab-ce!28271
| * | Add notify_only_default_branch option to PipelinesEmailServicePeter Marko2019-05-285-20/+86
| | |
* | | Merge branch 'sh-add-header-to-jobs-admin-page' into 'master'Clement Ho2019-05-282-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add a column header to admin/jobs page Closes #62347 See merge request gitlab-org/gitlab-ce!28837
| * | | Add a column header to admin/jobs pagesh-add-header-to-jobs-admin-pageStan Hu2019-05-282-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This column was blank before. It contain one or two pieces of information: * Job duration * Job completion timestamp For brevity, use `Timing` as the header. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62347
* | | | Merge branch 'glossary-merge-request-mr' into 'master'Tom Atkins2019-05-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add MR as common abbreviation for 'Merge Request' See merge request gitlab-org/gitlab-ce!28793
| * | | | Add MR as common abbreviation for 'Merge Request'glossary-merge-request-mrRene Verschoor2019-05-271-1/+1
| | | | |
* | | | | Merge branch '62227-webkit-icon-overlap' into 'master'Annabel Dunstone Gray2019-05-282-0/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable webkit icons Closes #62227 See merge request gitlab-org/gitlab-ce!28833
| * | | | | Disable webkit icons62227-webkit-icon-overlapJarek Ostrowski2019-05-282-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable webkit icons to make room for our icons. Add changelog Fix lint, add ignore to stylelint Add enable to start lint again
* | | | | | Merge branch 'kp-clean-up-avatars-stylesheet' into 'master'Annabel Dunstone Gray2019-05-281-98/+142
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use SCSS maps and lists to keep code DRY See merge request gitlab-org/gitlab-ce!28702
| * | | | | | Use SCSS maps and lists to keep code DRYkp-clean-up-avatars-stylesheetKushal Pandya2019-05-271-98/+142
| | | | | | |
* | | | | | | Merge branch 'doc-qa-doc-element-guidelines' into 'master'Lin Jen-Shin2019-05-285-52/+103
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for element naming conventions See merge request gitlab-org/gitlab-ce!28563
| * | | | | | | Iteration for _field being the well-formed elementddavison2019-05-281-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since number fields, text boxes, text areas are editable lets use _field as the vague descriptor
| * | | | | | | Add documentation for element naming conventionsddavison2019-05-285-52/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor all capital files to lowercase Signed-off-by: ddavison <ddavison@gitlab.com>
* | | | | | | | Merge branch 'i18n-chat-of-user-profile' into 'master'Clement Ho2019-05-284-10/+36
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Externalize strings of chat page in user profile See merge request gitlab-org/gitlab-ce!28632
| * | | | | | | Externalize strings of chat page in user profileantony liu2019-05-284-10/+36
|/ / / / / / /
* | | | | | | Merge branch 'docs/gb/expand-downstream-pipeline-variables' into 'master'Douglas Barbosa Alexandre2019-05-281-0/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs for a downstream pipeline variables expansion See merge request gitlab-org/gitlab-ce!28828
| * | | | | | | Docs for a downstream pipeline variables expansionGrzegorz Bizon2019-05-281-0/+28
|/ / / / / / /
* | | | | | | Merge branch 'i18n-notifications-of-user-profile' into 'master'Bob Van Landuyt2019-05-286-13/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings of notifications page in user profile See merge request gitlab-org/gitlab-ce!28745
| * | | | | | | Externalize strings of notifications page in user profileantony liu2019-05-286-13/+40
|/ / / / / / /
* | | | | | | Merge branch 'qa-extend-click-visit-actions' into 'master'Dan Davison2019-05-2814-46/+145
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement dynamic validation on QA Pages Closes gitlab-qa#280 See merge request gitlab-org/gitlab-ce!25704
| * | | | | | Remove blocks from Runtime::Browser.visit calls within Mattermost testsqa-extend-click-visit-actionsddavison2019-05-201-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use .perform instead of .act in Mattermost test Signed-off-by: ddavison <ddavison@gitlab.com>
| * | | | | | Up wait time to 60 seconds as before for LoginPageddavison2019-05-201-1/+1
| | | | | | |
| * | | | | | Implement dynamic validation on QA Pagesddavison2019-05-2013-38/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Elements now have the ability to be required on pages or not Currently using the default wait mechanism Altered the ElementWithPattern Cop to fit new splat for init
* | | | | | | Merge branch '62408-dropdown-truncate' into 'master'Phil Hughes2019-05-282-1/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truncates job names in pipeline graph Closes #62408 See merge request gitlab-org/gitlab-ce!28824
| * | | | | | Truncates job names in pipeline graph62408-dropdown-truncateFilipa Lacerda2019-05-282-1/+8
| | | | | | |
* | | | | | | Merge branch 'ntepluhina-master-patch-12194' into 'master'61539-qa-e2e-test-logging-results-when-tests-are-run-in-parallelPhil Hughes2019-05-281-2/+12
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Added a note about v-slot directive See merge request gitlab-org/gitlab-ce!28826
| * | | | | | Added a note about v-slot directiveNatalia Tepluhina2019-05-281-2/+12
|/ / / / / /
* | | | | | Merge branch 'increase-note-karma-spec-timeout' into 'master'Douglas Barbosa Alexandre2019-05-281-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase timeout of flaky specs Closes #62399 See merge request gitlab-org/gitlab-ce!28820
| * | | | | | Increase timeout of flaky specsHeinrich Lee Yu2019-05-281-2/+2
| | | | | | |
* | | | | | | Merge branch 'fix-import-param-ordering' into 'master'James Lopez2019-05-283-3/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix order dependency with user params during imports Closes #61715 See merge request gitlab-org/gitlab-ce!28719
| * | | | | | | Fix order dependency with user params during importsLiam McAndrew2019-05-283-3/+17
|/ / / / / / /
* | | | | | | Merge branch 'vue-repo-document-title' into 'master'Filipa Lacerda2019-05-284-3/+29
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Update document title when repository router changes See merge request gitlab-org/gitlab-ce!28714
| * | | | | | Update document title when repository router changesPhil Hughes2019-05-244-3/+29
| | | | | | |
* | | | | | | Merge branch 'if-10137-ee_specific_lines_variables_api' into 'master'Yorick Peterse2019-05-282-6/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of Move EE specific lines in API::Variables See merge request gitlab-org/gitlab-ce!28718
| * | | | | | | CE port of Move EE specific lines in API::VariablesImre Farkas2019-05-282-6/+17
|/ / / / / / /
* | | | | | | Merge branch 'if-10137-ee_specific_lines_users_api' into 'master'Yorick Peterse2019-05-283-8/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of Move EE specific lines in API::Users See merge request gitlab-org/gitlab-ce!28710
| * | | | | | | CE port of Move EE specific lines in API::UsersImre Farkas2019-05-283-8/+32
|/ / / / / / /
* | | | | | | Merge branch 'jp-label-fix' into 'master'Lin Jen-Shin2019-05-2810-19/+101
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix display of promote to group label Closes #62200 See merge request gitlab-org/gitlab-ce!28637
| * | | | | | | Fix display of promote to group labelJan Provaznik2019-05-2810-19/+101
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since label presenter is used in label index view, label class check doesn't work as expected because the class is now LabelPresenter. Also `label.subject` doesn't work as expected now because Label's model `subject` method is shadowed by Gitlab's presenter's method which uses `subject` for referencing the original object. Instead we use a presenter's method for both checks now. `label_deletion_confirm_text` is not used anywhere so it's removed
* | | | | | | Merge branch 'bvl-graphql-multiplex' into 'master'Lin Jen-Shin2019-05-288-34/+181
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Enables GraphQL batch requests See merge request gitlab-org/gitlab-ce!28273
| * | | | | | Enables GraphQL batch requestsPhil Hughes2019-05-288-34/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling GraphQL batch requests allows for multiple queries to be sent in 1 request reducing the amount of requests we send to the server. Responses come come back in the same order as the queries were provided.
* | | | | | | Merge branch 'revert-daa72ac8' into 'master'Kushal Pandya2019-05-282-21/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Add expand/collapse button to operation settings" See merge request gitlab-org/gitlab-ce!28818
| * | | | | | | Revert "Merge branch ↵Winnie Hellmann2019-05-282-21/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61511-add-expand-collapse-to-project-operation-setttings-2' into 'master'" This reverts merge request !28620
* | | | | | | Merge branch 'dz-scope-project-routes-2' into 'master'Dmitriy Zaporozhets2019-05-282-99/+110
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move more project routes under /-/ scope See merge request gitlab-org/gitlab-ce!28717
| * | | | | | | Move some project routes under - scopedz-scope-project-routes-2Dmitriy Zaporozhets2019-05-262-40/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected routes are: * autocomplete_sources * project_members * deploy_keys * deploy_tokens Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Move project routes under one scopeDmitriy Zaporozhets2019-05-241-60/+58
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'winh-upgrade-jest' into 'master'Phil Hughes2019-05-281-535/+758
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Jest to v24.8.0 See merge request gitlab-org/gitlab-ce!28786