summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Check for manual_sorting feature flag9121-sort-relative-positionBrett Walker2019-05-281-1/+1
|
* Allow issues to be sorted by relative_positionBrett Walker2019-05-288-33/+105
| | | | | - adding a "Manual" option to the dropdown - show 100 issues list when manually sorting
* 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
| * | | Upgrade Jest to v24.8.0Winnie Hellmann2019-05-281-535/+758
|/ / /
* | | Merge branch 'use-source-ref-name-in-webhook' into 'master'Ash McKenzie2019-05-283-1/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use source ref in pipeline webhook Closes #61553 See merge request gitlab-org/gitlab-ce!28772
| * | | Use source ref for pipeline webhookuse-source-ref-name-in-webhookShinya Maeda2019-05-283-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | When user uses Pipelines for merge requests, the pipeline is a run on a merge request ref instead of branch ref. However, we should send source ref as a webhook in order to respect the original behavior.
* | | | Merge branch 'issue/9978' into 'master'Filipa Lacerda2019-05-282-0/+9
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | added code differences from EE to CE See merge request gitlab-org/gitlab-ce!28711
| * | | added a new conditional to add `display: none;` dynamically if the row ↵Michel Engelen2019-05-282-0/+9
|/ / / | | | | | | | | | | | | | | | should be hidden, indicated by the variable `rowHidden` this solves issue #9978
* | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Phil Hughes2019-05-282-5/+5
|\ \ \ | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.63.0 See merge request gitlab-org/gitlab-ce!28715
| * | | Update dependency @gitlab/svgs to ^1.63.0Lukas 'Eipi' Eipert2019-05-242-5/+5
| | |/ | |/|
* | | Merge branch 'fix-format-date-safari-ff' into 'master'Phil Hughes2019-05-283-2/+32
|\ \ \ | | | | | | | | | | | | | | | | Throw an error when formatDate's input is invalid See merge request gitlab-org/gitlab-ce!28713
| * | | Throw an error when formatDate's input is invalidPaul Gascou-Vaillancourt2019-05-283-2/+32
|/ / /
* | | Merge branch 'project-members-scb' into 'master'Phil Hughes2019-05-283-18/+54
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in project members Closes gitlab-ee#10496 See merge request gitlab-org/gitlab-ce!28550
| * | | Resolve CE/EE diffs in project membersproject-members-scbLuke Bennett2019-05-273-18/+54
| | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | Merge branch 'i18n-preferences-of-user-profile' into 'master'Bob Van Landuyt2019-05-282-13/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Externalize strings of preferences page in user profile See merge request gitlab-org/gitlab-ce!28746
| * | | | Externalize strings of preferences page in user profileantonyliu2019-05-252-13/+43
| | | | |
* | | | | Merge branch 'id-bug-suggested-changes-remove-empty-line' into 'master'Stan Hu2019-05-284-7/+88
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Append endline only if suggestion present Closes #58566 See merge request gitlab-org/gitlab-ce!28703
| * | | | | Fix removing empty lines via suggestionsIgor2019-05-284-7/+88
|/ / / / / | | | | | | | | | | | | | | | | | | | | Before this fix, a suggestion which just removes an empty line wasn't appliable
* | | | | Merge branch 'i18n-authentication_log-of-user-profile' into 'master'Bob Van Landuyt2019-05-283-6/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Externalize stirngs of Authentication log page in user profile See merge request gitlab-org/gitlab-ce!28750
| * | | | | Externalize stirngs of Authentication log page in user profileantony liu2019-05-283-6/+13
|/ / / / /
* | | | | Merge branch 'api_make_protected_boolean_type' into 'master'Jan Provaznik2019-05-282-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | protected should be Boolean type See merge request gitlab-org/gitlab-ce!28766
| * | | | | Make protected attribute Boolean typeapi_make_protected_boolean_typeThong Kuah2019-05-282-2/+7
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | As documented in https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/api/project_level_variables.md#create-variable and it's a boolean in `db/schema.rb`
* | | | | Merge branch '61511-add-expand-collapse-to-project-operation-setttings-2' ↵Kushal Pandya2019-05-282-1/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add expand/collapse button to operation settings Closes #61511 See merge request gitlab-org/gitlab-ce!28620
| * | | | | Add expand/collapse buttonAdriel Santiago2019-05-282-1/+21
|/ / / / / | | | | | | | | | | | | | | | Add ability to expand/collapse operation settings
* | | | | Merge branch 'patch-59' into 'master'Evan Read2019-05-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Remove stray full stop from the middle of the sentence See merge request gitlab-org/gitlab-ce!28403
| * | | | | Remove stray full stop from the middle of the sentenceAndy Allan2019-05-171-1/+1
| | | | | |
* | | | | | Merge branch 'patch-60' into 'master'Evan Read2019-05-281-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update order of list to match HA setup order See merge request gitlab-org/gitlab-ce!28429
View Lorry Controller Status