summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Render 412 for invalid UTF-8 parametersfa-handle_invalid_utf8_errorsFelipe Artur2018-09-225-0/+73
| | | | | Renders 412 error page when invalid UTF-8 is passed as parameters in controllers.
* Merge branch 'rails5-deprecation-warnings-ce' into 'master'Robert Speicher2018-09-114-13/+21
|\ | | | | | | | | [CE] Fix rails 5 deprecation warnings See merge request gitlab-org/gitlab-ce!21673
| * Fix rails 5 deprecation warningsJan Provaznik2018-09-114-13/+21
| | | | | | | | Fixes rails 5 deprecation warnings in `config/` files
* | Merge branch '50632-combine-color-duplicates' into 'master'Clement Ho2018-09-1129-254/+59
|\ \ | | | | | | | | | | | | Resolve "[SCSS Variables Cleanup] Combine all duplicated hex colors in variables.scss", Part 1 See merge request gitlab-org/gitlab-ce!21375
| * | Remove jquery.scss; Combine multiple duplicate grays into global gray ↵Annabel Dunstone Gray2018-09-1129-254/+59
| | | | | | | | | | | | variables; Remove unused styles in common.scss
* | | Merge branch 'frozen-string-enable-vestigial' into 'master'Stan Hu2018-09-115-0/+13
|\ \ \ | | | | | | | | | | | | | | | | Enable frozen string in vestigial files See merge request gitlab-org/gitlab-ce!21665
| * | | Enable frozen string in vestigial filesgfyoung2018-09-115-0/+13
| | | | | | | | | | | | | | | | Partially addresses #47424.
* | | | Merge branch '51333-use-rails-root-for-common-metrics-importer' into 'master'Grzegorz Bizon2018-09-112-2/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Rails.root for CommonMetricsImporter Closes #51333 See merge request gitlab-org/gitlab-ce!21664
| * | | | Use Rails.root for CommonMetricsImporterKamil Trzciński2018-09-112-2/+12
| |/ / /
* | | | Merge branch 'sh-support-adding-confirmed-emails' into 'master'Robert Speicher2018-09-116-2/+31
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Add ability to skip user email confirmation with API Closes #50876 See merge request gitlab-org/gitlab-ce!21630
| * | | Add ability to skip user email confirmation with APIStan Hu2018-09-106-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives admins the ability to send a `skip_confirmation` flag in the `POST /users/:id/email` API endpoint to skip the verification step and assume the given e-mail address is verified. Closes #50876
* | | | Merge branch '50835-add-filtering-sorting-for-labels-on-labels-page' into ↵Dmitriy Zaporozhets2018-09-1111-2/+142
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add sorting for labels on labels page See merge request gitlab-org/gitlab-ce!21642
| * | | | Add sort dropdown to project labels page and group labels pageDmitriy Zaporozhets2018-09-1011-2/+142
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'fix-namespace-upload' into 'master'Kamil Trzciński2018-09-113-0/+15
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fix workhorse temp path for namespace uploads Closes gitlab-ee#7009 See merge request gitlab-org/gitlab-ce!21650
| * | | | Fix workhorse temp path for namespace uploadsJarka Košanová2018-09-113-0/+15
| | | | |
* | | | | Merge branch '49943-resolve-filter-bar-height-changes' into 'master'Annabel Dunstone Gray2018-09-112-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Filter bar height changes when items are added" Closes #49943 See merge request gitlab-org/gitlab-ce!21609
| * | | | | Resolve "Filter bar height changes when items are added"Andrea Leone2018-09-112-2/+7
|/ / / / /
* | | | | Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master'Grzegorz Bizon2018-09-115-12/+38
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project export broken when avatar is set" Closes #51318 See merge request gitlab-org/gitlab-ce!21649
| * | | | use find instead of reject in avatar export fileJames Lopez2018-09-111-1/+1
| | | | |
| * | | | fix avatar restorerJames Lopez2018-09-112-11/+24
| | | | |
| * | | | add changelogJames Lopez2018-09-101-0/+5
| | | | |
| * | | | fix avatar uploader errorJames Lopez2018-09-102-1/+9
| | | | |
* | | | | Merge branch 'jlenny-UpdateProductDiscoverySteps' into 'master'Achilleas Pipinellis2018-09-111-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add steps for closing product discovery issue See merge request gitlab-org/gitlab-ce!21273
| * | | | | Update design.mdMark Pundsack2018-09-101-6/+3
| | | | | |
| * | | | | Add steps for closing product discovery issuejlenny-UpdateProductDiscoveryStepsJason Lenny2018-08-171-4/+9
| | | | | |
| * | | | | Add steps for closing product discovery issueJason Lenny2018-08-170-0/+0
| | | | | |
* | | | | | Merge branch 'sh-test-ldap-clones-via-gitlab-qa' into 'master'Grzegorz Bizon2018-09-114-5/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Add support for testing Git over HTTP with LDAP users See merge request gitlab-org/gitlab-ce!21354
| * \ \ \ \ \ Merge branch 'master' into sh-test-ldap-clones-via-gitlab-qaStan Hu2018-08-29826-1984/+4602
| |\ \ \ \ \ \
| * | | | | | | Add support for testing Git over HTTP with LDAP usersStan Hu2018-08-224-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would have helped catch https://gitlab.com/gitlab-org/gitlab-ce/issues/50579.
* | | | | | | | Merge branch 'rails5-fix-issue-move-service' into 'master'Grzegorz Bizon2018-09-112-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5: fix issue move service See merge request gitlab-org/gitlab-ce!21616
| * | | | | | | | Rails 5: fix issue move serviceJasper Maes2018-09-112-1/+7
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rails 5, the attributes method for an enum returns the name instead of the database integer.
* | | | | | | | Merge branch 'sh-fix-ee-issue-7543' into 'master'Bob Van Landuyt2018-09-111-10/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add stub methods for FakeApplicationSetting Closes gitlab-ee#7543 See merge request gitlab-org/gitlab-ce!21662
| * | | | | | | Add additional stub methods for FakeApplicationSettingStan Hu2018-09-101-10/+18
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a migration spec, a default ApplicationSetting object may fail to create due to an unknown attribute and fall back to FakeApplicationSetting. FakeApplicationSetting appears to be missing a number of methods that are needed (https://gitlab.com/gitlab-org/gitlab-ce/issues/47491). This commit adds the ones needed to make an EE spec pass. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/7543
* | | | | | | Merge branch 'ml-qa-ldap-admin-license' into 'master'Stan Hu2018-09-106-49/+37
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Sign in as an admin account when adding a license See merge request gitlab-org/gitlab-ce!21657
| * | | | | | | Enable signing in as admin when adding a licenseMark Lapierre2018-09-106-49/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the ability to use admin credentials to add a license so that when testing an LDAP user on EE the LDAP user does not have to be an admin. Admin credentials default to GDK's root user. Can be overriden via ADMIN_USERNAME and ADMIN_PASSWORD environment variables.
* | | | | | | | Merge branch 'leipert-wrap-license-file' into 'master'Robert Speicher2018-09-101-3/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly wrap LICENSE file [ci skip] See merge request gitlab-org/gitlab-ce!21604
| * | | | | | | | properly wrap LICENSE fileLukas Eipert2018-09-081-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch '51268-clear-in-memory-application-settings-between-examples' ↵Robert Speicher2018-09-103-0/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Changes in in-memory application settings in one spec can break another spec" Closes #51268 See merge request gitlab-org/gitlab-ce!21638
| * | | | | | | | | Simplify setting of in_memory_application_settingsStan Hu2018-09-101-1/+1
| | | | | | | | | |
| * | | | | | | | | Work around migration specs failing due to repository storages not being ↵Stan Hu2018-09-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selected Migration specs may be missing a column necessary to create an ApplicationSetting object, which causes the FakeApplicationSetting to be initialized. However, the project selects a random repository storage via ApplicationSetting#pick_repository_storage, which isn't present in the OpenStruct. To workaround this issues, we add a pick_repository_storage method in FakeApplicationSetting.
| * | | | | | | | | Ensure in-memory application settings are cleared before each testRémy Coutable2018-09-102-0/+8
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'leipert-upgrade-karma' into 'master'Clement Ho2018-09-102-942/+73
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update karma: 2.0.4 -> ^3.0.0 See merge request gitlab-org/gitlab-ce!21593
| * | | | | | | | | update karma: 2.0.4 -> ^3.0.0Lukas Eipert2018-09-072-942/+73
| | | | | | | | | |
* | | | | | | | | | Merge branch 'glui-tooltip' into 'master'Mike Greiling2018-09-104-10/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add tooltip directive from gitlab-ui See merge request gitlab-org/gitlab-ce!21522
| * | | | | | | | | | add tooltip directive from gitlab-uiSimon Knox2018-09-104-10/+8
|/ / / / / / / / / /
* | | | | | | | | | Merge branch ↵Stan Hu2018-09-106-60/+118
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'da-synchronize-the-default-branch-when-updating-a-remote-mirror' into 'master' Synchronize the default branch when updating a remote mirror See merge request gitlab-org/gitlab-ce!21653
| * | | | | | | | | Add CHANGELOGDouglas Barbosa Alexandre2018-09-101-0/+5
| | | | | | | | | |
| * | | | | | | | | Synchronize the default branch when updating a remote mirrorDouglas Barbosa Alexandre2018-09-105-60/+113
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ce-7471-extract-ee-specific-models-from-all_models-yml' into ↵Robert Speicher2018-09-101-16/+26
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [CE] Make spec/lib/gitlab/import_export/all_models.yml EE-ready Closes gitlab-ee#7471 See merge request gitlab-org/gitlab-ce!21544
| * | | | | | | | | Make spec/lib/gitlab/import_export/all_models.yml EE-readyRémy Coutable2018-09-101-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This port https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7254 to CE. Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status