summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Addresses UX and BE comments:52363-ui-changes-to-cluster-and-ado-pagesMayra Cabrera2019-02-069-166/+103
| | | | | | - Changes help text on clusters form to make it more explicit. - Removes unnecessary warnings on auto devops form - Simplifies cluster methods logic
* Addresses backend/db review commentsMayra Cabrera2019-02-0413-24/+22
| | | | | | | | | - Fixes multiple typos on AutoDevops script - Add an alias to Clusters::Cluster#domain as base_domain, so it's more descriptive - Removes unnecessary memoization on qa specs - Changes migration to a post migration to deal better with traffic on big instances (like gitlab.com)
* Use a single sql statement for ADO queryMayra Cabrera2019-02-042-55/+32
| | | | | | Since cluster_projects table does not have a lot of records, currently it has 11,638, it seems better to use a single sql statement to update all the records
* Modifies ADO script to include new variableMayra Cabrera2019-02-041-12/+25
| | | | | | | | Ensure KUBE_INGRESS_BASE_DOMAIN existence by setting his value to AUTO_DEVOPS_DOMAIN if the first one doesnt exists. Also made corresponding changes throughout the whole script Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24580
* Moves domain setting to Cluster settingMayra Cabrera2019-02-0419-62/+421
| | | | | | | | | | | | Changes domain field to be on the Cluster page show, removing it from Auto DevOps setting. Also injects the new environment variable KUBE_INGRESS_BASE_DOMAIN into kubernetes#predefined_variables. Migration to move the information from ProjectAutoDevops#domain to Clusters::Cluster#domain. As well as necessary modifications to qa selectors Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52363
* Merge branch 'ce-mr-widget-service-endpoints-method' into 'master'Phil Hughes2019-02-041-3/+5
|\ | | | | | | | | CE Port of "Extract extension method from mr_widget_options" See merge request gitlab-org/gitlab-ce!24891
| * Extract extension method from mr_widget_optionsPaul Slaughter2019-02-031-3/+5
| | | | | | | | | | | | **Why?** - This fixes the CE/EE difference - More endpoints will be added in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9168
* | Merge branch ↵Rémy Coutable2019-02-043-59/+76
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '46448-add-timestamps-for-each-stage-of-gitlab-rake-gitlab-backup-restore' into 'master' Resolve "Add timestamps for each stage of gitlab-rake gitlab:backup:restore" Closes #46448 See merge request gitlab-org/gitlab-ce!19684
| * \ Merge branch 'master' into ↵Rémy Coutable2019-02-0411599-145620/+755016
| |\ \ | | | | | | | | | | | | | | | | | | | | '46448-add-timestamps-for-each-stage-of-gitlab-rake-gitlab-backup-restore' # Conflicts: # spec/tasks/gitlab/backup_rake_spec.rb
| * | | Add timestamps to gitlab-rake gitlab:backup:restoreWill Chandler2018-06-143-58/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new method 'puts_time' that prepends the time of a message when printing it. All instances of 'progress.puts' in the gitlab:backup:restore tasks are replaced with puts_time. Example output: 2018-06-03 16:33:25 -0400 -- Restoring uploads .. Closes #46448
* | | | Merge branch '51759-filter-by-language' into 'master'Andreas Brandl2019-02-046-0/+74
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Add programming language filtering to `/projects` Closes #51759 See merge request gitlab-org/gitlab-ce!24377
| * | | Add programming language filtering to `/projects`Dylan MacKenzie2019-02-046-0/+74
|/ / /
* | | Merge branch 'fine-tune-review-app-resource-requests' into 'master'Rémy Coutable2019-02-041-0/+5
|\ \ \ | | | | | | | | | | | | | | | | Fine-tune Review Apps pod resource requests See merge request gitlab-org/gitlab-ce!24630
| * | | Only use 2 replicas for nginx-ingress.controllerRémy Coutable2019-02-011-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Don't install Prometheus in Review AppsRémy Coutable2019-02-011-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Fine-tune Review Apps pod resource requestsRémy Coutable2019-02-011-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'sh-fix-oauth2-callback-caps' into 'master'Douglas Barbosa Alexandre2019-02-042-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downcase aliased OAuth2 callback providers Closes #57156 See merge request gitlab-org/gitlab-ce!24877
| * | | | Downcase aliased OAuth2 callback providersStan Hu2019-02-012-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users may specify an OAuth2 callback with a custom name, such as AWSCognito, but Rails will reject this with the following message: ``` 'import/AWSCognito' is not a supported controller name. This can lead to potential routing problems. See http://guides.rubyonrails.org/routing.html#specifying-a-controller-to-use ``` To avoid these errors, we can just downcase all the provider names. Note that this will make it impossible to specify a duplicate name with different cases. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57156
* | | | | Merge branch 'sh-fix-detect-host-keys' into 'master'Nick Thomas2019-02-043-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Detect Host Keys not working Closes #56855 See merge request gitlab-org/gitlab-ce!24884
| * | | | | Fix SSH Detect Host Keys not workingStan Hu2019-02-033-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a change in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24245, the Detect Host Key feature in the SSH mirroring stopped working. `SshHostKey#primary_key` was being used instead of the hard-coded `:id`. However, `SshHostKey#find_by` was expecting the symbolized `:id` rather than the string `id`, so it could never find the host key it was supposed to update. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56855
* | | | | | Merge branch 'patch-29' into 'master'Sean McGivern2019-02-042-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | accured -> occurred, as suggested in… See merge request gitlab-org/gitlab-ce!23629
| * | | | | | accured -> occurred, as suggested in…Yaron Shahrabani2019-02-042-4/+4
|/ / / / / /
* | | | | | Merge branch '55199-schema-and-model-changes' into 'master'Sean McGivern2019-02-047-9/+278
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | DB and model changes for Sentry project selection dropdown See merge request gitlab-org/gitlab-ce!24677
| * | | | | | DB and model changes for Sentry project selection dropdownReuben Pereira2019-02-047-9/+278
|/ / / / / /
* | | | | | Merge branch '49388-refactor' into 'master'Grzegorz Bizon2019-02-041-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor helper in environments controller for clarity See merge request gitlab-org/gitlab-ce!24781
| * | | | | | Refactor envs helper for claritysyasonik2019-01-291-3/+3
| | | | | | |
* | | | | | | Merge branch 'ee-1979-1-3-fix-approvals-required' into 'master'Sean McGivern2019-02-042-4/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consume jobs from dead and retry queues See merge request gitlab-org/gitlab-ce!24881
| * | | | | | | Consume remaining MigrateApproverToApprovalRulesInBatchMark Chao2019-02-022-4/+43
| | |_|/ / / / | |/| | | | | | | | | | | | Allow `steal` to handle dead jobs.
* | | | | | | Merge branch 'adriel-use-echarts-metrics-dashboard' into 'master'Phil Hughes2019-02-043-26/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ECharts for metrics dashboard graphs See merge request gitlab-org/gitlab-ce!24648
| * | | | | | | Use ECharts for metrics dashboardAdriel Santiago2019-02-013-26/+17
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Update metrics dashboard to support GitLab UI area chart changes
* | | | | | | Merge branch 'issue_55744' into 'master'Sean McGivern2019-02-046-3/+71
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix template labels Closes #55744 See merge request gitlab-org/gitlab-ce!24803
| * | | | | | | Fix template labelsFelipe Artur2019-02-046-3/+71
|/ / / / / / /
* | | | | | | Merge branch ↵Filipa Lacerda2019-02-047-22/+73
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '50521-block-emojis-and-symbol-characters-from-user-s-full-names-2' into 'master' Resolve "Block emojis and symbol characters from user's full names" Closes #50521 See merge request gitlab-org/gitlab-ce!24523
| * | | | | | | Block emojis from user nameMartin Wortschack2019-02-017-22/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use JS regex for emoji validation - Add test for blocking emojis in full name - Fix existing tests for user status that failed locally
* | | | | | | | Merge branch 'if-7693-smartcard_ldap_integration-ee_backport' into 'master'Dmitriy Zaporozhets2019-02-042-8/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of ee/9235: Add LDAP integration to smartcard authentication See merge request gitlab-org/gitlab-ce!24704
| * | | | | | | | Backport of ee/9235: Add LDAP integration to smartcard authenticationImre Farkas2019-01-272-8/+13
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-rubocop' into 'master'Rémy Coutable2019-02-043-11/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ReturnInVoidContext rubocop offense See merge request gitlab-org/gitlab-ce!24857
| * | | | | | | | | Fix warning already initialized constantSemyon Pupkov2019-02-011-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix ReturnInVoidContext rubocop offenseSemyon Pupkov2019-02-012-10/+7
| | | | | | | | | |
* | | | | | | | | | Merge branch 'update-ui-admin-appearance' into 'master'Phil Hughes2019-02-044-91/+101
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update UI of admin appearance settings See merge request gitlab-org/gitlab-ce!24685
| * | | | | | | | | | Update UI of admin appearance settingsAnnabel Dunstone Gray2019-02-014-91/+101
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the layout of the admin appearance settings to be consistent with other settings pages across GitLab
* | | | | | | | | | Merge branch ↵Sean McGivern2019-02-0436-169/+918
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneously' into 'master' Forms with task lists can be overwritten when editing simultaneously See merge request gitlab-org/gitlab-ce!23938
| * | | | | | | | | | lockVersion should be required false and default 019745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneouslyFatih Acet2019-02-011-1/+2
| | | | | | | | | | |
| * | | | | | | | | | Address review commentsBrett Walker2019-01-314-129/+128
| | | | | | | | | | |
| * | | | | | | | | | Simplify and unify Promise mocks in app_spec fileFatih Acet2019-01-301-61/+43
| | | | | | | | | | |
| * | | | | | | | | | Stop closing issue edit form in error stateFatih Acet2019-01-302-5/+3
| | | | | | | | | | |
| * | | | | | | | | | Regenerate the gitlab.potBrett Walker2019-01-301-1/+7
| | | | | | | | | | |
| * | | | | | | | | | Fix rubocop errorsBrett Walker2019-01-301-2/+4
| | | | | | | | | | |
| * | | | | | | | | | Fix task list feature specsBrett Walker2019-01-301-13/+13
| | | | | | | | | | |
| * | | | | | | | | | Changes for review commentsBrett Walker2019-01-303-25/+30
| | | | | | | | | | |