Commit graph

28847 commits

Author SHA1 Message Date
Sergio Padrino
d81139b4a4 De-emphasize suggestion to change local git config #610 2021-02-17 13:21:54 +01:00
Sergio Padrino
763bf4169e Remove unused field #610 2021-02-17 13:21:54 +01:00
Sergio Padrino
5cbf738ccb Use a different caret position for the popover 2021-02-17 13:21:54 +01:00
Sergio Padrino
96a1e7ffb0 Suggest users to fix author issues from the repo settings #610 2021-02-17 13:21:54 +01:00
Sergio Padrino
a6ea8b1284 Use the GitConfigUserForm in the new repository git config screen #610 2021-02-17 13:21:54 +01:00
Sergio Padrino
31c3a11356 Improve logic to save git config per repo #610 2021-02-17 13:21:54 +01:00
Sergio Padrino
13d0a495c5 Improve logic to initialize local git config values #610
Assume the local comitter data can be null
2021-02-17 13:21:54 +01:00
Sergio Padrino
c61323fa65 Add functions to remove config values #610 2021-02-17 13:21:54 +01:00
Sergio Padrino
bbc318cda9 Make Fork Behavior the last tab of the repo settings #610
Needed because Fork Behavior is optional, and breaks everything if we add a tab after it.
2021-02-17 13:21:54 +01:00
Sergio Padrino
4125ea8bf1 Clean up: rename constant #610 2021-02-17 13:21:54 +01:00
Sergio Padrino
7d040979bc Allow retrieving only the local value of a git config key #610 2021-02-17 13:21:54 +01:00
Sergio Padrino
1de124ea86 When a new git config is loaded, avoid using the Other option if possible #610 2021-02-17 13:21:54 +01:00
Sergio Padrino
9429c43209 Allow disabling the git config user form #610 2021-02-17 13:21:54 +01:00
say25
c38717cc43 Use const for Linter Gods 2021-02-17 13:21:54 +01:00
say25
c3a62a8769 Store and use initialGitConfigLocation 2021-02-17 13:21:54 +01:00
say25
13742a6b64 Post Rebase Conflict Resolution 2021-02-17 13:21:54 +01:00
say25
e7e55e7356 Lint Const 2021-02-17 13:21:54 +01:00
say25pp
6516c35121 Implement GitConfig Setting section within Repository Settings 2021-02-17 13:21:54 +01:00
say25pp
1a414d0797 Extract logic in setGlobalConfigValue to create setConfigValueInPath for later reuse like getConfigValueInPath 2021-02-17 13:21:54 +01:00
say25pp
a517a5d22a Create invalidGitAuthorNameMessage for reuse later 2021-02-17 13:21:54 +01:00
say25
ee1dc1f222 Remove Global from comment as sometimes command is specific to path 2021-02-17 13:21:54 +01:00
say25
6fa83c4b31 Move identifier-rules to common location 2021-02-17 13:21:54 +01:00
tidy-dev
e0cbe9fc9f Cherry Picking Feature Flag 2021-02-17 07:06:52 -05:00
tidy-dev
6e48dbdebf
Merge pull request #11606 from desktop/cherry-pick-track-progress
Cherry pick track progress
2021-02-17 06:56:04 -05:00
Sergio Padrino
898d5f72ca
Merge pull request #11591 from desktop/wrong-email-warning 2021-02-17 03:54:31 -08:00
Sergio Padrino
fe4acb5259
Merge pull request #11510 from desktop/trampoline-server-playground 2021-02-17 03:40:32 -08:00
tidy-dev
1050d6eb91 Regex start at beginning of line 2021-02-17 06:33:41 -05:00
tidy-dev
59eb501e3b Typo and documentation improvements 2021-02-17 06:33:27 -05:00
Sergio Padrino
cec4e427f4 Bump trampoline version to v0.9.2 2021-02-17 11:42:37 +01:00
Sergio Padrino
f353373e41 Merge branch 'development' into trampoline-server-playground 2021-02-17 11:36:51 +01:00
tidy-dev
44e3e6fb0b Clarify comment 2021-02-16 20:59:56 -05:00
tidy-dev
ba171aa9c3 Typo 2021-02-16 20:58:18 -05:00
tidy-dev
2179f189f4 Cherry Pick Progress Tracking 2021-02-16 20:54:20 -05:00
Sergio Padrino
b7d250b7d6 Improve wording and styling in the new popup #610 2021-02-16 18:54:16 +01:00
Sergio Padrino
e99dac0211 Don't "ignore" the warning badge forever #610 2021-02-16 18:53:57 +01:00
Sergio Padrino
b005166369 In the warning popover, truncate long emails in the dropdown #610
Co-Authored-By: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
2021-02-16 16:07:26 +01:00
Sergio Padrino
8a97fcafcd Refactor CommitMessageAvatar component to be less smart 😄 #610
Co-Authored-By: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
2021-02-16 16:04:47 +01:00
Sergio Padrino
425aa92c52 Use readonly in avatar state to please our linter 2021-02-16 12:10:36 +01:00
Sergio Padrino
28d8394c1a Resize and align the warning icon properly #610 2021-02-16 12:10:36 +01:00
Sergio Padrino
992f0ba64b Allow the user to actually ignore wrong email warnings for every repo #610 2021-02-16 12:10:36 +01:00
Sergio Padrino
0fbb3a2302 Show a warning badge on the avatar when the email doesn't match the account #610 2021-02-16 12:10:36 +01:00
Sergio Padrino
f34a3deafc Refresh the repository author after changing the git config #610
This is needed to make sure the user avatar is updated too.
2021-02-16 12:10:36 +01:00
Sergio Padrino
2db9f847bd
Merge pull request #11599 from desktop/dont-maximize-ever-time
Don't maximize the window when the Dock icon is clicked
2021-02-16 03:10:06 -08:00
Sergio Padrino
856bef21e2
Merge pull request #11571 from desktop/popover-refactor 2021-02-16 03:09:39 -08:00
Sergio Padrino
a79e6b3424 Only maximize the window the first time it's shown. Fixes #11590 2021-02-16 10:56:01 +01:00
Sergio Padrino
8147c748e7
Merge pull request #11596 from shiftkey/fix-jest-deprecations
port jest setup to use new parameters based on deprecations
2021-02-15 12:13:42 -08:00
Brendan Forster
0eadcc219e port jest setup to use new parameters based on deprecations 2021-02-15 15:06:21 -04:00
Sergio Padrino
6d72bbe587 Rename property for better readability #610 2021-02-15 13:58:02 +01:00
Sergio Padrino
1b472354e7 Add comment to explain how popover caret positions work #610 2021-02-15 13:58:02 +01:00
Sergio Padrino
a142efd610 Add the ability to select the caret position for a popover #610 2021-02-15 13:58:02 +01:00