| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: I3ca3855bf4e1e4ed9c508c556d92fd8fb1b74ae6
Reviewed-by: Tomas Ljunggren <tomas.ljunggren@tieto.com>
Reviewed-by: Peter Heubeck <peter.heubeck@tieto.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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 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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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 warnings by removing a few unused imports.
Change-Id: I4d8a7f7bee42b0a19bc15ff6f410758acdcd8b2a
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
Topic review feature integration had left add reviewer panel
hidden permanently. Re-enabled its visibility.
Change-Id: Ided01c7bb66b0273517892f20094ad14d6c0dbb0
|
|
|
|
|
|
|
| |
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 command help which is printed
out when using --help option.
Change-Id: I5aeee7ef3dbe54cf65eb1fdb179cc9ed8a7c8080
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
The submit flag was moved to AbstractEntity class. There
was a left over and duplicate flag in ChangeDetail class.
Change-Id: Ia31eeb074c46844b601b6f92c50d96e42e47c950
|
|
|
|
|
|
|
| |
Included staging access rights to schema update. Values from
database will be converted to git configuration file settings.
Change-Id: Id750a3b2769ec8744ac3b4bcf7e1416fe8ea15a1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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 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
|
|
|
|
|
|
|
|
|
| |
Modified topic reviews to work with v2.2.1.
Changed schema version to allow schema fixes for coming
releases.
Change-Id: I22d2715ed8c72a0c961b76c2a3f01f26bcbc655d
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
| |
Change-Id: I93643c4d0aec8a9b194f8606839673ba0dbf1e3f
Signed-off-by: Shawn O. Pearce <sop@google.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: If75ca735e5bea95f136cd7dc0ebf73de582af37f
Signed-off-by: Shawn O. Pearce <sop@google.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The Mylyn Reviews project pointed out Gerrit changed the API
signature of a JSON method they use remotely. Fix the API back to the
original signature, and define a new method with the extra arguments.
Change-Id: I51cbbdd64bdb72a666a6b5266db3b93494b75182
Signed-off-by: Shawn O. Pearce <sop@google.com>
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
A project is visible to a user when the user has Read Access on any
ref of the project. This check whether an access right is granted on
any ref is not taking the access rights granted to the
'Project Owners' group into account. As a result a user does not see
a project if he is project owner and Read Access is only granted to
the 'Project Owners' group. This change ensures that the
'Project Owners' group is properly resolved in this case.
Bug: issue 997
Change-Id: I27cd8293e5c4a01c867a4e076073bf587294e0ba
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When the user views a file diff and then changes in the Patch History
the selection of side A (left side), then this selection is lost when
the user navigates to the previous or next file diff. The selection of
side A is always reset to the patch set that is selected as 'Old
Version History' on the ChangeScreen (the base for comparing patch
sets).
This change ensures that the selection in the Patch History is kept
when the user navigates to the previous or next file diff.
Bug: issue 999
Change-Id: I19cafedd8a11683dca4a24fbebbcacf63425fe62
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
|
| |
| |
| |
| |
| | |
Change-Id: Iaf110a8499eb5c1169a3f70a56ec6ca6d299b6c1
Signed-off-by: Shawn O. Pearce <sop@google.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Replace the code with an error message that git has to be
in the PATH instead of trying to parse gerrit.conf with
shell code. The shell code do not remove whitespaces as
it should and this will give stranger errors when looking
for java later in the script (all platforms/shells).
This code doesn't seem to have been used anyway.
Change-Id: Ideba5b950a97c0e77839cbddd4616ef737470da2
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Allow users request SHA1 of multiple branches per command:
$ ssh -p 29418 review.example.com gerrit ls-projects -b eclair -b gingerbread
In case if a branch is not visible or does not exists then stub is shown. Here is
a sample of the command output:
---------------------------------------- d8a9e45c7ec6ff97b44fdbd0b21cabdb69f5f15b foo
---------------------------------------- 87e4297f8f508e9b73863b27c25a551a4d4b5ed5 bar
a7e9587229246f6eb876795bc45a09c17b3bed51 862b2ce84f38e93a50d29510e713475f11228b28 baz
405cd3f5d7df7bae701b313dad9ce2ef797eb754 6a7eb2f0c885d03320b58afb662ee4fc14659063 hello
---------------------------------------- 782effdaeba782a656f799c9584dcc82fbfb7fa7 world
b8240b951de6c03f72278dd3d7790c2355878197 e8099cc12a3b64aa4e58b319e61f0190e27bd3ac kext
Change-Id: Ib05a6fc770ed0b70a3c180b2a41bec5e95a7117b
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The name "-- All Projects --" is awkard to work with on the command
line due to starting with leading hypens, and containing spaces.
In prior versions of Gerrit Code Review this did not really matter,
the project was stored only in the database and did not need to be
accessed by command line tools. Now that the access controls are
in Git and are stored in a Git repository, this directory exists
and needs to be managed.
Bug: issue 994
Change-Id: I19b0967c6cf2720dcd2fd72a354e3566def15fdb
Signed-off-by: Shawn O. Pearce <sop@google.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If a project has no access controls listed in its project.config,
nobody was able to add new sections in the web UI. Ensure that
users are at least able to create new sections if they have owner
power on any reference, which may be inherited down from parent
projects or be implied because of their site administrator status.
Bug: issue 1000
Change-Id: I19bab2a75fe3248275fef9fd87ed86cfa580845a
Signed-off-by: Shawn O. Pearce <sop@google.com>
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: I2bc786285940655d17c498ec6abbe8dfe8e5e974
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The abandon and restore routines can fail if the change
is in the wrong state (abandoned already, or open still).
These failure lead to internal NPEs. Instead, create a
new exception and give a reason for the failure to the user.
Change-Id: Id7861d75e535c439c12329f7e891797c5b1f6eca
|
|\ \ \ \ |
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We don't push our code to a Maven repository, so there only reason
to construct source archives is to feed source files into the GWT
compiler. Move the source plugin onto only the packages that we
feed into the GWT code, allowing the others to skip this step.
This fixes a "bug" in a later change that adds the Prolog Cafe
translater to the build process. Without this change first, the
Prolog Cafe translator is firing twice for every Prolog source file
that is part of our standard build.
Change-Id: Iba38aa371ce7c8950ac30dc3cf06e01b465afb5a
Signed-off-by: Shawn O. Pearce <sop@google.com>
|
|/ / /
| | |
| | |
| | |
| | |
| | | |
Change-Id: I864dc6eca27ed9bca7004ef9bc5b5536737cc6ec
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
Bug: issue 1001
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I53ba82c6347ec79686f047099de34636611507e2
Signed-off-by: Shawn O. Pearce <sop@google.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I1d3e6c42bc678536162a81d2b13372659a1c3dec
Signed-off-by: Shawn O. Pearce <sop@google.com>
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
* stable:
Update 2.1.7 release notes
ExportReviewNotes: Default to 2 threads
Change-Id: Icc576083ec6ffa5cbbe5163ab34b8c843dc3ab66
|