summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Danger check for ignored eslint rulesleipert-frontend-dangerLukas Eipert2018-09-293-0/+31
| | | | | | We disabled a lot of eslint rules on a per-file basis. This checks touched files for those and reminds you to re-enable the rules and fix them.
* Danger check for unprettified JavaScriptLukas Eipert2018-09-283-1/+42
| | | | | This adds a Dangerfile which executes `prettier` to find out if someone touched Frontend files and forgot to run it on their current branch.
* Merge branch 'dz-migration-index-helper' into 'master'Dmitriy Zaporozhets2018-09-285-7/+17
|\ | | | | | | | | | | | | Add mysql_compatible_index_length to migration helpers Closes #50253 See merge request gitlab-org/gitlab-ce!21852
| * Add mysql_compatible_index_length to migration helpersdz-migration-index-helperDmitriy Zaporozhets2018-09-215-7/+17
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch '51927-fix-job_details-json-schema' into 'master'Grzegorz Bizon2018-09-281-1/+4
|\ \ | | | | | | | | | | | | | | | | | | Fix job_details.json schema Closes #51927 See merge request gitlab-org/gitlab-ce!21983
| * | Fix job_details.json schemaSteve Azzopardi2018-09-281-1/+4
| | | | | | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51927
* | | Merge branch 'da-clarify-subgroup-permissions' into 'master'Achilleas Pipinellis2018-09-281-15/+17
|\ \ \ | | | | | | | | | | | | | | | | Clarify subgroup permissions See merge request gitlab-org/gitlab-ce!21769
| * | | Update notes notation in subgroups docsAchilleas Pipinellis2018-09-281-10/+9
| | | |
| * | | Update render style of note boxesda-clarify-subgroup-permissionsdappelt2018-09-211-4/+4
| | | |
| * | | Address Evan's commentsdappelt2018-09-191-4/+5
| | | |
| * | | Clarify subgroup permissionsdappelt2018-09-181-2/+4
| | | |
* | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-09-281-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Documentation: Fix broken link of feature proposal template in issue_workflow.md See merge request gitlab-org/gitlab-ce!21894
| * | | Fix broken link of feature proposal template in issue_workflow.mdZsolt Kovari2018-09-241-2/+2
| | | |
* | | | Merge branch 'fix-karma-out-of-memory' into 'master'Filipa Lacerda2018-09-281-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix karma out-of-memory failures See merge request gitlab-org/gitlab-ce!21912
| * | | | Fix karma out-of-memory failuresfix-karma-out-of-memoryMike Greiling2018-09-251-0/+3
| |/ / /
* | | | Merge branch 'rename-local-variable' into 'master'Filipa Lacerda2018-09-282-11/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Rename block scope local variable in table pagination spec See merge request gitlab-org/gitlab-ce!21969
| * | | | Rename block scope local variable in table pagination specGeorge Tsiolis2018-09-272-11/+16
| | | | |
* | | | | Merge branch 'fix_css-badge-class' into 'master'Filipa Lacerda2018-09-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change class .label to .badge for 2FA label in group members view See merge request gitlab-org/gitlab-ce!21759
| * | | | | Change class .label to .badge for 2FA label in group members viewsedrubal2018-09-151-1/+1
| | | | | |
* | | | | | Merge branch 'docs-50503-issueboards-overview' into 'master'Mike Lewis2018-09-285-113/+176
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: improve Issue Boards overview (to deprecate feature page) Closes #50503 See merge request gitlab-org/gitlab-ce!21905
| * | | | | | Docs: improve Issue Boards overview (to deprecate feature page)Marcia Ramos2018-09-285-113/+176
|/ / / / / /
* | | | | | Merge branch 'mk/asymmetric-exists-cache' into 'master'Stan Hu2018-09-288-51/+438
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Geo: Does not mark repositories as missing on primary due to stale cache" Closes #50211 and #44044 See merge request gitlab-org/gitlab-ce!21789
| * | | | | | Remove send-in-send for safety and readabilityMichael Kozono2018-09-271-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I attempted to refactor so that the caller of `wrap_method` passes in a block, rather than a method name, but I was unsuccessful. I kept getting the following error: NoMethodError: undefined method `cache_method_output' for Repository:Class If you can figure this out, then feel free to dry up these class methods again without doing a send-within-a-send.
| * | | | | | Add changelog entryMichael Kozono2018-09-271-0/+6
| | | | | | |
| * | | | | | Expire RequestStore cache properlyMichael Kozono2018-09-272-0/+15
| | | | | | |
| * | | | | | Cache `Repository#exists?` false in RequestStoreMichael Kozono2018-09-277-2/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Only truthy values are cached in Redis. * All values are cached in RequestStore and in an instance variable.
| * | | | | | Extract `Repository.memoize_method` methodMichael Kozono2018-09-273-48/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And reuse `Gitlab::Utils::StrongMemoize`. There is a subtle behavior change required to reuse StrongMemoize in this case. The early fallback check now occurs *before* reading the memoized value instead of after. I think this is fine since a memoized value should only exist if `exists?` is also already memoized as `true`.
* | | | | | | Merge branch '6717_extend_reports_for_security_products' into 'master'Kamil Trzciński2018-09-2718-203/+379
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend reports to support security features See merge request gitlab-org/gitlab-ce!21892
| * | | | | | | Extend reports to support security featuresOlivier Gonzalez2018-09-2718-203/+379
|/ / / / / / /
* | | | | | | Merge branch 'pedroms-master-patch-57786' into 'master'Annabel Dunstone Gray2018-09-272-3/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix blue, orange, and red colors See merge request gitlab-org/gitlab-ce!21972
| * | | | | | | Fix blue, orange, and red colorsPedro Moreira da Silva2018-09-272-3/+8
|/ / / / / / /
* | | | | | | Merge branch 'qa-fix-sanity-framework-test' into 'master'Douglas Barbosa Alexandre2018-09-271-3/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a sanity framework test See merge request gitlab-org/gitlab-ce!21956
| * | | | | | | Fix a sanity framework testqa-fix-sanity-framework-testRémy Coutable2018-09-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On first load, the login page displays the "Change your password" tab, not the "Sign in" tab. We now assert on the presence of a text that's always on this page. Note that in EE, since a license is added in the `#perform_before_hooks` method, the password is changed so that when we visit the login page, the "Sign in" tab is displayed as expected. That's why only the CE job failed to pass in https://gitlab.com/gitlab-org/gitlab-qa/pipelines/31060920. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'group-weight-icon-and-text' into 'master'Annabel Dunstone Gray2018-09-271-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add right margin to board-card-number See merge request gitlab-org/gitlab-ce!21939
| * | | | | | | | Add right margin to board-card-numberGeorge Tsiolis2018-09-261-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'more-table-widths' into 'master'Filipa Lacerda2018-09-272-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an extra width to the responsive tables See merge request gitlab-org/gitlab-ce!21928
| * | | | | | | | | Adds a changelogmore-table-widthssamdbeckham2018-09-261-0/+5
| | | | | | | | | |
| * | | | | | | | | Adds an extra width to the responsive tablessamdbeckham2018-09-261-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'qa-fix-register-spec-failure' into 'master'Rémy Coutable2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Resolve "Failure in qa/specs/features/browser_ui/1_manage/login/register_spec.rb" See merge request gitlab-org/gitlab-ce!21963
| * | | | | | | | | | Set initial password if promptedqa-fix-register-spec-failureMark Lapierre2018-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fabricating a user might be the first action in the first test. If so, set the initial password
* | | | | | | | | | | Merge branch 'sh-bump-gitlab-workhorse-6.1.1' into 'master'Nick Thomas2018-09-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab-workhorse to 6.1.1 to fix custom error handling See merge request gitlab-org/gitlab-ce!21967
| * | | | | | | | | | | Bump gitlab-workhorse to 6.1.1 to fix custom error handlingStan Hu2018-09-271-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '50904-use-vuex-store-job' into 'master'Phil Hughes2018-09-279-174/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses new Vuex store in job log page See merge request gitlab-org/gitlab-ce!21961
| * | | | | | | | | | | Uses new Vuex store in job log pageFilipa Lacerda2018-09-279-174/+38
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes old mediator and service pattern and uses the new store. Middle step before moving everything into one single vue app
* | | | | | | | | | | Merge branch '4907-improve-build-create-performance-for-license-management' ↵Kamil Trzciński2018-09-272-8/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Dont create license_management build when not included in license See merge request gitlab-org/gitlab-ce!21958
| * | | | | | | | | | | Dont create license_management build when not included in license4907-improve-build-create-performance-for-license-managementDylan Griffith2018-09-272-8/+12
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves CI performance since we do not create a whole new job that just exits quickly. This is important based on https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/4907#note_104742212
* | | | | | | | | | | Merge branch 'dz-expose-cluster-id-to-jupyter' into 'master'Dmitriy Zaporozhets2018-09-272-0/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab cluster id to jupyter config Closes #51474 and #51594 See merge request gitlab-org/gitlab-ce!21796
| * | | | | | | | | | | Add GitLab cluster id to jupyter configdz-expose-cluster-id-to-jupyterDmitriy Zaporozhets2018-09-182-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | Merge branch 'patch-29' into 'master'Stan Hu2018-09-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typo in log message of gitlab-rake gitlab:artifacts:migrate See merge request gitlab-org/gitlab-ce!21936
| * | | | | | | | | | | Typo in log message of gitlab-rake gitlab:artifacts:migrateMichael Bisbjerg2018-09-271-1/+1
|/ / / / / / / / / / /
View Lorry Controller Status