summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Release of JIRA issues: 167 220 270 335 347 350 352 372 375 385 389V2.2.1-NQT-003BL-QTQAINFRA-381BL-QTQAINFRA-355BL-QTQAINFRA-348Tomas Ljunggren2011-12-051-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Consider sanity review column Fix typo in project config's topic review checkbox label Fixed automatic update of reviewer list Fixed gerrit email verification link requires insecure login Fixed late removal of review approvals Fixed review database update from StagingApprove Keep highlight on review request Release of JIRA issues: 167 270 335 347 350 352 Set patch approval changeOpen to false Change-Id: Ide51fd24b101eaa1c1af98f03190485baeff7d0e
| * Keep highlight on review requestTomas Ljunggren2011-12-051-1/+3
| | | | | | | | | | | | | | | | | | | | Sanity review caused review request highlighting to disappear. Now the flag hasReview is not set to true if approval category equals SRVW Task-number: QTQAINFRA-385 Change-Id: I834a28d937671f7e14cde7586376cc164576c9c8 Reviewed-by: Tomas Ljunggren <tomas.ljunggren@tieto.com>
* | Merged correction into integrationTomas Ljunggren2011-12-052-4/+6
|\ \ | | | | | | | | | | | | | | | Merged 'origin/corrections/qtqainfra-389' into integration/v2.2.1 Change-Id: I78b3bd9af2c68adc4bb2acc6f764e2da3025470a
| * | Set patch approval changeOpen to falseTomas Ljunggren2011-12-052-4/+6
| |/ | | | | | | | | | | Task-number: QTQAINFRA-389 Change-Id: I1c503d392ed4f64d93a8b3637548fb0c47304b8e Reviewed-by: Tomas Ljunggren <tomas.ljunggren@tieto.com>
| * Release of JIRA issues: 167 270 335 347 350 352BL-QTQAINFRA-389BL-QTQAINFRA-375BL-QTQAINFRA-372BL-QTQAINFRA-220Tomas Ljunggren2011-11-160-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider sanity review column Fix typo in project config's topic review checkbox label Fixed automatic update of reviewer list Fixed gerrit email verification link requires insecure login Fixed late removal of review approvals Fixed review database update from StagingApprove Change-Id: Iae780cea31cb0899487f67b566182c242f2ea859
* | \ RC-V2.2.1-INT-003V2.2.1-NQT-001Tomas Ljunggren2011-11-110-0/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | Consider sanity review column Fix typo in project config's topic review checkbox label Fixed automatic update of reviewer list Fixed gerrit email verification link requires insecure login Fixed late removal of review approvals Fixed review database update from StagingApprove Change-Id: I7f1cdd6a104fd17e4a698f97adc9a67b4bb85d86
| * Consider sanity review columnRC-V2.2.1-INT-002Tomas Ljunggren2011-11-112-7/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in project config's topic review checkbox label Fixed automatic update of reviewer list Fixed gerrit email verification link requires insecure login Fixed late removal of review approvals Fixed review database update from StagingApprove Change-Id: I62a4850dc2e58e48670018bfe534665360286b47
* | \ RC-V2.2.1-INT-002Tomas Ljunggren2011-11-112-7/+15
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | Consider sanity review column Fix typo in project config's topic review checkbox label Fixed automatic update of reviewer list Fixed gerrit email verification link requires insecure login Fixed late removal of review approvals Fixed review database update from StagingApprove Change-Id: I0b20af2aa4d0b9b871eba7c081d5298dea610611
| * Consider sanity review columnTomas Ljunggren2011-11-112-7/+15
| | | | | | | | | | | | | | | | | | | | | | Changed the approval summary to consider the sanity review column as sanity reviews are automated. Previously the sanity review checkmark was only visible if reviewer self put +1 in sanity review. Now it accomodates for the approval made by the sanity bot. Change-Id: I64b803ff6f77ebc0c4bbb65ea308bc7a6b4aba72 Task-number: QTQAINFRA-350 Reviewed-by: Tomas Ljunggren <tomas.ljunggren@tieto.com>
* | Fixed gerrit email verification link requires insecure loginPeter Heubeck2011-11-100-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed review database update from StagingApprove Fixed automatic update of reviewer list Fixed late removal of review approvals Fix typo in project config's topic review checkbox label Change-Id: I038838acacc712d0cd367850e19d5c637ce64362
| * | Fixed gerrit email verification link requires insecure loginPeter Heubeck2011-11-101-0/+9
| |/ | | | | | | | | Change-Id: I40e014882b0bff031fa5f2ad242c0ec040075b52 Reviewed-by: Peter Heubeck <peter.heubeck@tieto.com>
* | Merge remote-tracking branch 'origin/corrections/qtqainfra-335' into ↵Peter Heubeck2011-11-100-0/+0
|\ \ | | | | | | | | | integration/v2.2.1
| * | Fixed automatic update of reviewer listTomas Ljunggren2011-11-011-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I3ca3855bf4e1e4ed9c508c556d92fd8fb1b74ae6 Reviewed-by: Tomas Ljunggren <tomas.ljunggren@tieto.com> Reviewed-by: Peter Heubeck <peter.heubeck@tieto.com>
* | | Merge remote-tracking branch 'origin/corrections/qtqainfra-352' into ↵Peter Heubeck2011-11-101-1/+1
|\ \ \ | | | | | | | | | | | | integration/v2.2.1
| * | | Fix typo in project config's topic review checkbox labelSergio Ahumada2011-11-021-1/+1
| | |/ | |/| | | | | | | | | | Change-Id: Ied017b0e2c75af529f6cdbd5c93c07968597f464 Reviewed-by: Tomas Ljunggren <tomas.ljunggren@tieto.com>
* | | Merge remote-tracking branch 'origin/corrections/qtqainfra-347' into ↵Peter Heubeck2011-11-108-5/+68
|\ \ \ | | | | | | | | | | | | integration/v2.2.1
| * | | Fixed late removal of review approvalsTomas Ljunggren2011-11-108-5/+68
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Added logic to prevent user performing review operation if status of change is INTEGRATING. Task-number: QTQAINFRA-347 Change-Id: Icc2bd5bed618d271041fe6a5669778795537d81c Reviewed-by: Tomas Ljunggren <tomas.ljunggren@tieto.com>
* | | Merge remote-tracking branch 'origin/corrections/qtqainfra-270' into ↵Peter Heubeck2011-11-101-0/+3
|\ \ \ | | | | | | | | | | | | integration/v2.2.1
| * | | Fixed review database update from StagingApproveTomas Ljunggren2011-11-101-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a call to ChangeUtil to submit (to DB) all changes that was approved by the SSH command staging-approve. This should remove the changes from the dashboard review requests section. Task-number: QTQAINFRA-270 Change-Id: I5c96180b8868596a57e5cbd794654833e9d038ed Reviewed-by: Peter Heubeck <peter.heubeck@tieto.com>
* / / Fixed gerrit email verification link requires insecure loginPeter Heubeck2011-11-101-0/+9
|/ / | | | | | | Change-Id: I40e014882b0bff031fa5f2ad242c0ec040075b52
* / Fixed automatic update of reviewer listBL-QTQAINFRA-352BL-QTQAINFRA-350BL-QTQAINFRA-270BL-QTQAINFRA-167Tomas Ljunggren2011-11-011-0/+1
|/ | | | | | Change-Id: I3ca3855bf4e1e4ed9c508c556d92fd8fb1b74ae6 Reviewed-by: Tomas Ljunggren <tomas.ljunggren@tieto.com> Reviewed-by: Peter Heubeck <peter.heubeck@tieto.com>
* Fixed applyTypeFloor NPEBL-QTQAINFRA-335Mika Hamalainen2011-10-151-1/+2
| | | | | | | | The NPE was caused by old-style staging approvals which were not filtered out as the submit approvals are. Change-Id: I55e1d40c6e2476bd48d371cdf980531af12662be Reviewed-by: Mika Hämäläinen <mika.hamalainen@accenture.com>
* Improved staging SSH command help textsMika Hamalainen2011-09-204-5/+5
| | | | | | | | Added better descriptions and examples for different branches used by staging commands. Change-Id: I4e10c032a10129dfe282de42c8d0abd816fa8598 Reviewed-by: Mika Hämäläinen <mika.hamalainen@accenture.com>
* Removed staging approval categoryMika Hamalainen2011-09-203-67/+0
| | | | | | | | | Removed staging approval category. Staging is handled like submit, and no approval category is used for tracking submit or staging in 2.x version. Change-Id: I90f943a99c4bb689128502e019a141b10c05ef90 Reviewed-by: Mika Hämäläinen <mika.hamalainen@accenture.com>
* Improved help message for staging-rebuild commandMika Hamalainen2011-09-151-1/+1
| | | | | | | | | | Changed branch example to indicate the correct ref for parameter --branch | -b. Change-Id: I51791cb3d73158f8f0f0526a662ccc6f1184f58b Reviewed-on: http://dev-codereview.qt-project.org/40 Reviewed-by: Mika Hämäläinen <mika.hamalainen@accenture.com> Sanity-Review: Mika Hämäläinen <mika.hamalainen@accenture.com>
* Fixed error when pushing to a staged changeMika Hamalainen2011-09-091-1/+3
| | | | | | | | Added check for staging category when analysing approval categories for an existing change. Staging state needs a similar handling as the submitted state. Change-Id: I4fdd0d0e80c6434899502ed6f8a72b8d01fbd2ea
* Fixed cherry pick options in All-ProjectsMika Hamalainen2011-09-091-3/+9
| | | | | | | | Cherry pick options was previously visible also in the All-Projects view. Fixed visibility for cherry pick options panel so that it is visible only for actual projects. Change-Id: I9b9fb131eba7b051a8a00ca1d248225622b44a0b
* Fixed warning from unused importsMika Hamalainen2011-09-062-3/+0
| | | | | | Fixed warnings by removing a few unused imports. Change-Id: I4d8a7f7bee42b0a19bc15ff6f410758acdcd8b2a
* Unstaging support for topicsMika Hamalainen2011-09-067-5/+213
| | | | | | | | | | | | Topics can be now removed from staging. The topic needs to be in STAGED state and the current user must be able to abandon the topic for the remove from staging button to be visible. Each change is separately set to NEW status and the staging branch is rebuild. Change-Id: If8ef39ba9d40e97bd3170a46047041b4939dc290
* Fixed staging button enabling in publish screenMika Hamalainen2011-09-061-0/+1
| | | | | | | | Staging button did not get disabled during RPC request. Fixed the button behavior so that it matches how the other buttons behave in this screen. Change-Id: I408ae8a4b27cff8ca526126c1f74eeb5a743853c
* Fixed add reviewer panel visibilityMika Hamalainen2011-09-061-3/+1
| | | | | | | Topic review feature integration had left add reviewer panel hidden permanently. Re-enabled its visibility. Change-Id: Ided01c7bb66b0273517892f20094ad14d6c0dbb0
* Renamed staging option for review SSH commandMika Hamalainen2011-09-061-1/+1
| | | | | | | The option that merges the patch set to staging is now --stage instead of the previous --staging. Change-Id: Idba8c3bb3681ad547e404eb953c470fa942a50e9
* Fixed a typo in staging-ls helpMika Hamalainen2011-09-051-1/+1
| | | | | | | Fixed a typo in staging-ls command help which is printed out when using --help option. Change-Id: I5aeee7ef3dbe54cf65eb1fdb179cc9ed8a7c8080
* Notification e-mails when build is approvedMika Hamalainen2011-09-026-0/+340
| | | | | | | | Added e-mail notifications for approved and rejected builds. This includes new e-mail templates and sender classes. The e-mails are send from the staging approve command. Change-Id: I159c166ed1e62ecddfbfea0155d6ca278afe1eb7
* Fixed staging-ls destination branch checkMika Hamalainen2011-08-184-24/+57
| | | | | | | | | | | | The destination branch check was not working correctly when listing changes in refs/staging or refs/builds. Added convertion from other branch for refs/heads when checking for destination branch. Staging-ls now requires a new paramater, --destination, to get information about the destination branch. Change-Id: I877c8d504e4eef0214f328b8cf94ed66da5b0210
* Prevent staging changes which belong to a topicMika Hamalainen2011-08-181-6/+6
| | | | | | | | Changes that are are part of a topic should be staged only when topic is staged. Removed option to stage a change if it is part of a topic. Change-Id: I11302ce88fec725e76cc0d18c47544782ecb1610
* Fixed submit flag in ChangeDetailMika Hamalainen2011-08-181-1/+0
| | | | | | | The submit flag was moved to AbstractEntity class. There was a left over and duplicate flag in ChangeDetail class. Change-Id: Ia31eeb074c46844b601b6f92c50d96e42e47c950
* Staging approval category schema updateMika Hamalainen2011-08-111-1/+6
| | | | | | | Included staging access rights to schema update. Values from database will be converted to git configuration file settings. Change-Id: Id750a3b2769ec8744ac3b4bcf7e1416fe8ea15a1
* One-page reviewMika Hamalainen2011-08-1025-415/+1895
| | | | | | | | | | | | | | | | A complete change can be reviewed from single page. The new screen is launched from 'Diff All Side-by-Side' and 'Diff All Unified' buttons on the change screen. v2.2.1 compatible - Removed top view - Reverted navigation link (token) format Additionally - Fixed cursor when clicking sidebyside table Bug: issue 938 Change-Id: I5ed6ce2b861cf481c4d33b10bf677355039a3333
* Integrated staging to topic reviewsMika Hamalainen2011-08-0438-171/+557
| | | | | | | | | | | | | | | | | | | | | | Added staging feature to topic reviews. Changes include staging UI, topic merging and staging command changes. Topics can be staged as any individual changes. When creating or approving builds, topic approval is checked instead of change approval when change is part of a topic. Additional changes: - Based on v2.2.1 - Fixed StagingCommand.openChanges to check destination branch Change-Id: I52a6aec206ac2ae2e98afd8e2e60e02c9d51f6f4 Conflicts: gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/ChangeSetPublishDetailFactory.java gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/topic/TopicDetailFactory.java gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StagingApprove.java
* Commit message footer options for cherry-pick modeMika Hamalainen2011-08-036-3/+196
| | | | | | | | | | When using cherry pick submit type, there additional options which define which footers are added to the commit message. Also, added footers can be limited to reviewers who gave the maximum approval score. Bug: issue 655 Change-Id: Ibfb7193edde7f88607683adf061e8603cb382d06
* [PATCH] don't look for footers in the first two lines of a commit messageMika Hamalainen2011-08-031-1/+1
| | | | | | | | Looking into the first line will make "tagged" subjects ("foo: bar") throw off the footer logic. Looking into the second line makes no sense whatsoever. Change-Id: I0666d2354215207dd0f80f7976dac0ab6d198219
* Change "Anonymous Coward" with "Anonymous User" textSergio Ahumada2011-08-038-14/+14
| | | | | | | | | Gerrit may offend people by calling them "Anonymous Coward" Task-Number: QTQAINFRA-232 Change-Id: I9ce24d604344de5676688011ec35a2a218b2e9db Reviewed-on: http://dev-codereview.qt.nokia.com/162 Reviewed-by: Mika Hämäläinen <mika.hamalainen@accenture.com>
* Qt faviconMika Hamalainen2011-08-031-0/+0
| | | | | | | | Replaced the existing Gerrit favicon with Qt's favicon. Change-Id: I3850ab834d9678e08f94f836c6702de924ab7f25 Reviewed-on: http://dev-codereview.qt.nokia.com/159 Reviewed-by: Mika Hämäläinen <mika.hamalainen@accenture.com>
* Staging branch featureMika Hamalainen2011-08-0356-70/+3051
| | | | | | | | | | | | | | | | | | | | Staging branch allows user to move changes to staging branch for further testing before they are merged into repository. Staging branches are located in folder refs/staging/<branch>. <branch> matches branch under refs/heads. A staging branch is moved to testable build with SSH commands. Build refs are under refs/builds. Staging branch is updated in the following situations - User moves a new change to staging. The change is merged to staging branch. - User creates a new build. Staging is re-created from refs/heads. - User merges a build to refs/heads. The staging branch is updated to match the updated head. Changes include: new button in change screen, new category called 'staging', SSH commands for managing staging and build branches. Change-Id: I74e9aef595db9b78ca0998bc576df5ec6071c99c
* v2.2.1 fix for topic reviews featureMika Hamalainen2011-08-0321-357/+113
| | | | | | | | | Modified topic reviews to work with v2.2.1. Changed schema version to allow schema fixes for coming releases. Change-Id: I22d2715ed8c72a0c961b76c2a3f01f26bcbc655d
* Topic reviews featureDiego Celix2011-08-02112-918/+8429
| | | | | | | | | Squashed all change from 0.2 release together. See github for more details: https://github.com/petefoth/gerrit-topic-reviews/wiki/Release-0.2 Change-Id: I8b3ef3897e1f5f5b1d84faf1cf71c4e01cd9b668
* Draft release notes for 2.2.1v2.2.1Shawn O. Pearce2011-06-072-0/+80
| | | | | Change-Id: I93643c4d0aec8a9b194f8606839673ba0dbf1e3f Signed-off-by: Shawn O. Pearce <sop@google.com>
* Merge branch 'stable'Shawn O. Pearce2011-06-079-21/+82
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable: Fix ChangeDetailFactory's invocation of PatchSetDetailFactory Release notes for 2.1.7.1 Fix API breakage on ChangeDetailService Do not reset Patch History selection on navigation to next file diff Resolve Project Owners when checking access right on any ref Conflicts: gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java Change-Id: I6e956625cb4648df35035b9be2d32e6e431fb8f3
| * Fix ChangeDetailFactory's invocation of PatchSetDetailFactoryv2.1.7.2Shawn O. Pearce2011-06-073-2/+2
| | | | | | | | | | | | | | | | I flipped the order of the arguments, but did not correctly update all callers. Change-Id: Iae14ec35374342f53bc353082db35cb8750a750a Signed-off-by: Shawn O. Pearce <sop@google.com>