summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Contain our excitement by not using "!" in our error message49075-add-status-message-from-within-user-menuDennis Tang2018-10-032-3/+3
|
* Use different emoji menu class to avoid conflict on settings pageDennis Tang2018-10-032-5/+6
|
* Use sentence casing for tooltip on "x" button to clear inputsDennis Tang2018-10-033-5/+5
|
* Make emoji in user dropdown status slightly larger than status textDennis Tang2018-10-031-0/+4
|
* Rename "Clear status" button to "Remove status"Dennis Tang2018-10-032-5/+5
|
* Show input clear button only if emoji or message is setDennis Tang2018-10-021-1/+9
|
* Revise code as per FE and UX discussionsDennis Tang2018-10-025-36/+26
|
* Add tests for user status modalDennis Tang2018-10-011-52/+197
|
* Update documentation for setting user statusDennis Tang2018-10-011-0/+7
|
* Set status message from within user menuDennis Tang2018-10-0116-76/+519
| | | | | | Users are now able to set, edit, and clear their status in the convenience of the user menu located at the top-right of the main navigation bar.
* Merge branch 'frozen-string-app-enforce' into 'master'49897-fix-removing-todos-for-confidential-issuesStan Hu2018-09-292-0/+24
|\ | | | | | | | | Check frozen string in style builds See merge request gitlab-org/gitlab-ce!21999
| * Check frozen string in style buildsgfyoung2018-09-282-0/+24
| |
* | Merge branch 'docs-50507-pages-overview' into 'master'Mike Lewis2018-09-289-40/+148
|\ \ | |/ |/| | | | | | | | | Docs: improve Pages overview (to deprecate feature page) Closes #50507 See merge request gitlab-org/gitlab-ce!21798
| * Docs: improve Pages overview (to deprecate feature page)Marcia Ramos2018-09-289-40/+148
|/
* Merge branch 'bvl-merge-translations-docs' into 'master'Achilleas Pipinellis2018-09-282-0/+62
|\ | | | | | | | | [Docs] Document how to merge translations from Crowdin See merge request gitlab-org/gitlab-ce!21924
| * Document how to merge translations from Crowdinbvl-merge-translations-docsBob Van Landuyt2018-09-282-0/+62
| |
* | Merge branch '51404-update-groups-and-projects-api-docs' into 'master'Achilleas Pipinellis2018-09-282-0/+7
|\ \ | | | | | | | | | | | | | | | | | | Docs for Project/Groups members API with inherited members Closes #51404 See merge request gitlab-org/gitlab-ce!21984
| * | Docs for Project/Groups members API with inherited members51404-update-groups-and-projects-api-docsJacopo2018-09-282-0/+7
| | | | | | | | | | | | | | | Expains the differences between `api/projects/:id/members` and `api/projects/:id/members/all` related to inherited members.
* | | 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
View Lorry Controller Status