summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused import in EditIteratorTestv2.9-rc0David Pursehouse2014-03-111-1/+0
| | | | Change-Id: I0758a836d5448e19f3f9a18dc70ed08fb3c1ebdf
* Merge "Enable disabled gwtui tests"Shawn Pearce2014-03-102-5/+4
|\
| * Enable disabled gwtui testsDavid Ostrovsky2014-03-102-5/+4
| | | | | | | | | | | | | | | | | | | | | | a283507bccbd408540ae1baf75eb80eb59dce031 disabled EditIteratorTest due to gwt-test-utils uncompatibility with new GWT 2.6 release. After fixing the compatibility problem in [1] the tests can be enabled again. [1] https://github.com/gwt-test-utils/gwt-test-utils/issues/62 Change-Id: I1f93e6422a1ae60d66f4d8b4abac23b6a1acb4f9
* | Merge branch 'stable-2.8'David Pursehouse2014-03-103-11/+56
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.8: Update 2.8.2 release notes Make the message of 'Cherry Picked' informative Show error message when the commentlink is configured wrongly Conflicts: gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java Change-Id: I82a7ac51f31fec83166ecad26e65d66623d2cda4
| * | Update 2.8.2 release notesDavid Pursehouse2014-03-071-1/+31
| | | | | | | | | | | | Change-Id: Iaf3f4ca1a45df7104e87491c5c223c4046f92ae9
| * | Make the message of 'Cherry Picked' informativeBruce Zu2014-03-071-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The message reads: "This patchset was cherry picked to change: <Change-Id>" This is not very informative, since the Change-Id is identical to the current change. A better message would be: "This patchset was cherry picked to branch <branch name> as commit <SHA1>" Bug: issue 2513 Change-Id: I8bfb61b1a314cf2a985df7a571bb28e3f6cb49d4
| * | Show error message when the commentlink is configured wronglyBruce Zu2014-03-071-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the 'commentlink.<subsection-name>.match' is configured wrongly, e.g. invalid regular expression, the change screen cannot be loaded, and there is no error message or log. Show an error dialog. Bug: Issue 2514 Change-Id: Ie36fcdb0be13690cacaa64e235a08d7913dea937
* | | Protect reload plugin command with allow remote admin optionDavid Ostrovsky2014-03-101-0/+3
| |/ |/| | | | | | | | | | | | | | | | | | | fd03350b9ea8af3cdf65fb8fb2367e333b252de4 introduced a new option to disable remote plugin administration. Require reloading plugins to be explicitly allowed with: plugins.allowRemoteAdmin = true Change-Id: I2946202dd40af8b4197212fb15a488b166883d8a
* | Merge "Validate email address when adding email or creating account"Shawn Pearce2014-03-084-4/+23
|\ \
| * | Validate email address when adding email or creating accountEdwin Kempin2014-02-074-4/+23
| | | | | | | | | | | | | | | | | | | | | This checks that the email address has a valid format. Change-Id: I1f8d95dd9b02e720996bd15cca093ca55b5e4597 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
* | | Merge changes Ic29a4ec0,Ic40487d3Shawn Pearce2014-03-083-18/+348
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Make it easy to construct CSS and HTML from JavaScript plugins Wrap long JSNI in ApiGlue
| * | | Make it easy to construct CSS and HTML from JavaScript pluginsShawn Pearce2014-03-063-0/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scoping CSS rules across plugins can be slightly tricky, as the namespace is global for the entire browser window. Allow plugins to create unique names using Gerrit.css() and then use those inside of HTML with class="{style.foo}" style replacements in the Gerrit.html() function. This style of development makes native HTML and CSS more natural to use inside of a plugin's JavaScript, and reduces the risks of conflicting CSS rules with core Gerrit or another plugin. Event handler registration is also supported, making it easier to attach functions to handle onclick for buttons and anchors. Handler registration avoids circular references between the function's environment and the DOM node, ensuring garbage collection works. Change-Id: Ic29a4ec0c15eedef4f4ce72031193f1896742dc5
| * | | Wrap long JSNI in ApiGlueShawn Pearce2014-03-061-18/+59
| | | | | | | | | | | | | | | | Change-Id: Ic40487d3831f0d42a4f919796fb8c703d0a2d597
* | | | Use atomic update when storing mergeable and last SHA1 testedShawn Pearce2014-03-071-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change may have been modified while the merge test was being computed. The author could have added a new patch set, or MergeOp may have finished merging the change concurrently with a rescan triggered by a prior merge on the same branch. Only update the change if the status is still open and the current patch set matches the one that was actually tested. Change-Id: Ie2801621281a7605089122c6021e612434844f21
* | | | Fix race condition between MergeOp and MergeabilityCheckerShawn Pearce2014-03-071-61/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeabilityChecker is a GitReferenceUpdatedListener, which gets called after the reference updates but before the change status is written to the database. To reduce latency during merge the rescan operation is sent to a background thread pool. It is possible for the background thread to scan the database and observe the recently merged change with status at SUBMITTED, as the scan can run before the status is changed to MERGED. If the MergeOp thread writes the status to the database before Mergeable finishes the check, then Mergeable will replace the status with SUBMITTED, making the change appear to be unsubmitted. One part of a fix is to move the reference update notification after writing the change status to the database. This will have the least surprising semantics for plugins and any other code wired into the listener. Commits visible in the reference will now show as merged if the listener queries for them. Change-Id: Ib8d034c3f2eb79716b5ebc1ed426a0e8dbb0861a
* | | | Merge "Switch to the xsiframe GWT linker"Shawn Pearce2014-03-0713-582/+5
|\ \ \ \
| * | | | Switch to the xsiframe GWT linkerShawn Pearce2014-03-0713-582/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be the default in a future version of GWT. It is not compatible with Gerrit's hacky server side selector. Get rid of the hacky server selection and run only the stock code. The new linker selection is compatible with Super Dev Mode. Change-Id: I26c2ed184b6f336d4f964732023aa81d647a5e7c
* | | | | Bump JGit version to 3.3.0Saša Živkov2014-03-071-7/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I30c94c7b98529c503a2baf1cf3b6efcb36b60513
* | | | | Update cookbook pluginDavid Pursehouse2014-03-071-0/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | - Remove duplicated plugin name Change-Id: I5d706905fe9b7983abf9c64441467aae351724ef
* | | | Fix NullPointerException if String value is nullEryk Szymanski2014-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I1dbec095a4763fc0a7f06e38f24a4b033ec375d0 Signed-off-by: Eryk Szymanski <eryksz@gmail.com>
* | | | Merge "Add method to AccountAccess interface to get all accounts ordered by ID"Shawn Pearce2014-03-061-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Add method to AccountAccess interface to get all accounts ordered by IDDavid Pursehouse2014-03-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | This will allow clients to iterate over the entire list of registered users, ordered by the account ID. Change-Id: Ic63827c3c9e2c8d6cde3ff8e38a820f8ee9d9495
* | | | Merge "Bump GWT version to 2.6.0"Shawn Pearce2014-03-061-3/+3
|\ \ \ \
| * | | | Bump GWT version to 2.6.0David Ostrovsky2014-03-051-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I3353e086112bd1bc4ac9bb2adc35110324c70059
* | | | | Merge "Fix: 'Illegal label name'"Shawn Pearce2014-03-061-1/+1
|\ \ \ \ \
| * | | | | Fix: 'Illegal label name'Bruce Zu2014-03-061-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | review command like 'ssh -p 29418 user@review gerrit review <change>,<patch-set> --label code-review=+1' fails with: fatal: Illegal label name "code-review=" Fixed by using right parse function. Bug: Issue 2516 Change-Id: Ib95b377786d89bcc33bf0af6ab7e130084547125
* | | | | Merge "CM3: Add support for dark themes"Shawn Pearce2014-03-066-1/+49
|\ \ \ \ \
| * | | | | CM3: Add support for dark themesDavid Ostrovsky2014-03-046-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84a66d82d36d554c1844acff11d1a62f10c174ed added support for light and dark themes, but dark themes weren't enabled, as diff styles have to be adjusted to correspond with dark colors. 101a8c4b65ebee4d54afddad10db05f5b9698ba9 reverted the preparation for dark themes support. This change enables support for subset of dark themes and switch dynamicaly the diff styles to dark colors, when dark theme was selected. Change-Id: Ic220baf8f19366c04520b61e893a0d11912805ef
* | | | | | Merge branch 'stable-2.8'Shawn Pearce2014-03-0614-23/+101
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.8: Update 2.8.2 release notes with recently merged changes. Change dialog title from Error to Warning on intraline diff timeout Another attempt to fix submit rule evaluation for non blocking labels Fix: Label update operation is executed as insert RFC: Work around null commit when updating submodules Change-Id: Icc1ce1698add8321a86af42ed864b02d9ef58040
| * | | | Merge "RFC: Work around null commit when updating submodules" into stable-2.8Shawn Pearce2014-03-061-0/+3
| |\ \ \ \
| | * | | | RFC: Work around null commit when updating submodulesDavid Pursehouse2014-03-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: Issue 2498 Change-Id: I5d82ead765bc743d3392a1333cd2c3fc4cf971c7
| * | | | | Update 2.8.2 release notes with recently merged changes.David Pursehouse2014-03-061-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id8b008abd7d3a01f23fe61370612c681183c8605
| * | | | | Change dialog title from Error to Warning on intraline diff timeoutBruce Zu2014-03-064-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the value of 'diff_intraline.timeout' is not long enough to let IntraLineLoader compute the intraline, Gerrit will set its status as TIMEOUT and cache it. When the user opens the diff view a dialog will appear with Error title to say "Intraline difference not available due to timeout". Change the 'Error' title to 'Warning' to reduce number of complaints from users. Change-Id: I440d03593eb82d9c6c213cdc77d3fd3d50a760eb
| * | | | | Another attempt to fix submit rule evaluation for non blocking labelsDavid Ostrovsky2014-03-065-15/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New change screen changed the logic for submit status evaluation by moving it partially to the client side. The change can be submitted only when all needed labels have max scores and there is no labels exist with min score. The computation of rejection is based on `rejected` attribute in LabelInfo class. This attribute was set in two places: 1. As outcome of submit rule evaluation (with blocking functions) 2. In setLabelScores() to render the result for non blocking labels After overriding of rejected attribute for non blocking labels it was not possible any more to differentiate on the client side if one particular label was rejected for information purpose only or because it was blocked. 5a32a6dc15b73d412645598648ac089eacf29b65 was trying to solve it by not overriding the rejected attribute in setLabelScores(). The consequence of doing it was however, that custom labels with min score were rendered not as rejected but as disliked. This change introduces the `blocking` attribute in LabelType class to carry out the missing information to the client to perform the correct submit status computation. Now the rejected attribute can be overridden for custom non blocking labels and rendered correctly. Bug: Issue 2453 Bug: Issue 2497 Change-Id: Ic5092342b0e2153eb43f5e06fda4fcac4699844e
| * | | | | Fix: Label update operation is executed as insertBruce Zu2014-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When updating an existing label value with command like ssh -p 29418 user@review gerrit review <change>,<patchset> --label code-review=+1 where the lower case label name will make the update operation become insert operation. This causes an exception: "Unique index or primary key violation" Use standard label name instead of lower case name. Bug: Issue 2515 Change-Id: I735a5f84d0569554c050b60b8984ee83aa941d39
* | | | | | Merge "Add extension point to register JGit PostReceiveHooks"Edwin Kempin2014-03-064-1/+27
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add extension point to register JGit PostReceiveHooksSaša Živkov2014-03-054-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plugins may want to get notified when a pack file is received. For example, the quota plugin may want to cache the repository size in the file system and update it every time a new pack is received. Change-Id: I0212eab6e4867819ebe7ecc7fc5532c26bb82282
* | | | | | Merge changes Ie59a530f,I0825b3c2Shawn Pearce2014-03-0412-31/+187
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Merge branch 'stable-2.8' Add submit rule evaluation tests for custom labels
| * \ \ \ \ \ Merge branch 'stable-2.8'David Pursehouse2014-03-048-10/+23
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.8: Update replication plugin Enable creating new branch and push local new commits in one step. Add Implementation-Vendor default manifest entry Fix incompatibility between "Rebase if Necessary" and "copy*Score*" Fix submit rule evaluation for non blocking labels Set uploader to current user in "patchset-created" event upon rebasing Guard against diff.mnemonicprefix in commit-msg hook Conflicts: gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/BUCK gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/AddReviewerInput.java gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/RebaseIfNecessary.java Change-Id: Ie59a530fe2c0fe66244d010e01e3cdf41de150f0
| | * | | | | Update replication pluginDavid Pursehouse2014-03-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix JAR manifest claiming it is Commons IO project Change-Id: Ia6929b27589700d7bcab20a9a5b85926636ab463
| | * | | | | Enable creating new branch and push local new commits in one step.Bruce Zu2014-03-033-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct push local commits to create a new branch is rejected, even when user group can - 'Read', - 'Create Reference', - 'Push' on 'refs/heads/*'. User have to firstly create new branch with a commit which exists on server side, then push other local new commits. The reason is that Gerrit take it for granted that the commits used to create new branch exist on server side already, so Gerrit only check the commits are reachable or not on the server side. According to the same reason if user group can 'Read' on 'refs/*' or have Global Capabilities 'Administrate Server', Gerrit will think the commits sure will be reachable for user and stop do further checking. So Gerrit does not work in the cases where creating new branch with local new commits, e.g. the commits come from outer partners and need not review, and the user group is not of Admin group and should not be able to see every thing for some business rules reason. Taking local new commits into account, also including the related permission checking, now it can be finished in one step to create new branch and push local new commits. Bug: Issue 2441 Change-Id: I4e580e2fe0b40b8d0fbb06c5c8d1efd61127a842
| | * | | | | Add Implementation-Vendor default manifest entryDavid Ostrovsky2014-03-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I40039bba02ed0169df02bc1d335606dd34473366
| | * | | | | Fix incompatibility between "Rebase if Necessary" and "copy*Score*"Jean-Jacques Lafay2014-02-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug when : - a project is set up with "Rebase if Necessary" - one of its labels has copyAllScoresOnTrivialRebase (or copyMaxScore) - a change that actually needs a trivial rebase is submitted Gerrit first rebases, and in the process copies the approval for the label, then it copies all the approvals, including the one already copied, which results in a constraint violation on the database. Fix by using upsert instead of insert (duplicates are identical anyway). Change-Id: Iadccfa581cf273028a9b9b6065b6d1071842d27f
| | * | | | | Fix submit rule evaluation for non blocking labelsDavid Ostrovsky2014-02-254-25/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Putting a negative score on a label configured as `NoBlock` causes the submit button to be disabled. However, a `NoBlock` label is supposed to be purely informational and its values not considered when determining whether a change is submittable. Fix the submit rule evaluation to prevent the button from being disabled. Also add an integration test. Bug: Issue 2453 Change-Id: I0825b3c2d4774c17d523ac5f7890b983fa07af39
| | * | | | | Set uploader to current user in "patchset-created" event upon rebasingChristian Aistleitner2014-02-252-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rebasing a change through the Web-UI (both old and new ChangeScreen), the corresponding patchset-created event had its patchSet.uploader set to the Change's owner instead of the current user. We now set it to the current user, so stream-events consumers can properly detect who uploaded the rebased patch set. Bug: Issue 2493 Change-Id: Iea9459c7015cde9e869dad5946bd1d3b2db5d51a
| | * | | | | Guard against diff.mnemonicprefix in commit-msg hookJonathan Nieder2014-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the '[diff] mnemonicprefix' configuration is enabled, and changes are committed with "git commit -v", the diff included in the commit message starts with "diff --git c/" instead of "diff --git a/", causing the commit-msg hook to keep the diff in the message it produces. Change-Id: Icbe9cf55305d432fca2875357f289685d6c51c87
| * | | | | | Add submit rule evaluation tests for custom labelsDavid Ostrovsky2014-03-044-21/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug issue: 2453 Change-Id: I0825b3c2d4774c17d523ac5f7890b983fa07af39
* | | | | | | Merge "Add project clone command that automatically installs commit-msg hook"Shawn Pearce2014-03-042-0/+61
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add project clone command that automatically installs commit-msg hookEdwin Kempin2014-03-042-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7cc7af9f7c255da2e3f73e662710b58366c2079 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
* | | | | | | Fix potential NPE in ShowQueueEdwin Kempin2014-03-041-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | taskInfo.getProjectNameKey() may return null. Change-Id: Iac86fe43b308c5a63ae52eb6d82c858e897c16f0 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 03:31:11 +0000