37904 Commits

Author SHA1 Message Date
David Ostrovsky
0257d38fa5 Bazel: Fix update instruction for license file
In recent Bazel versions, bazel-genfiles directory is replaced with
bazel-bin directory. Adapt the instruction for updating the license
file correspondingly.

Change-Id: I07bf1d9c13e25b8befe8c16ddd708f6c00b1ed70
2019-10-11 19:29:40 +02:00
David Pursehouse
9a4011934f Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
  Update _calculatePatchChange to not include MERGE_LIST

Change-Id: Id22f00c6b3a1c2b3fb1ab24a109ed6de0e6d1a96
2019-10-11 19:48:23 +09:00
Ben Rohlfs
f4242ad13c Merge "Update _calculatePatchChange to not include MERGE_LIST" into stable-2.16 2019-10-11 09:35:17 +00:00
Paladox none
b4feb97954 Update _calculatePatchChange to not include MERGE_LIST
Bug: Issue 11715
Change-Id: I255c8c517e21cb5a3e83404dcbf45ea3b94662d7
2019-10-11 08:09:37 +00:00
David Pursehouse
8a4eb8a07e Upgrade JGit to 5.3.6.201910020505-r
This release includes a fix [1] that gives a significant performance
improvement in the case when Gerrit loads all external-ids from NoteDb.
This happens whenever the external_ids_map cache gets invalidated or
expires.

With NoteDb containing about 70K external-ids the following times were
measured [2] for loading all external-ids:

* Using JGit without [1]: 10 seconds
* Using JGit with [1]: 2 seconds

[1] https://git.eclipse.org/r/150254
[2] https://gerrit-review.googlesource.com/c/gerrit/+/240194

Change-Id: I32f408f5caead1c9e79d5ef61c2d2888deda05e0
2019-10-11 08:42:26 +09:00
David Pursehouse
04896eef26 Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
  Bazel: Bump bazel version to 1.0.0
  Syntax highlighting: associate *.cproj and *.xaml as xml
  Upgrade JGit to 5.1.12.201910011832-r

The change "Upgrade JGit to 5.1.12.201910011832-r" is intentionally
omitted in this merge since we use a different major release on the
stable-3.0 branch.

Change-Id: Ice7098a5ede220c0d2122a1d7d76a481c5b1726d
2019-10-11 08:31:59 +09:00
David Pursehouse
8273f5f161 Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
  Bazel: Bump bazel version to 1.0.0

Change-Id: Ie4ee6bfb16761939b4ceac4800f5a4b50343326e
2019-10-11 08:30:48 +09:00
David Pursehouse
b5de3f8cee Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Bazel: Bump bazel version to 1.0.0

Change-Id: I5e1bf2e386490e4619882ee0ae4775c2004fd006
2019-10-11 08:29:09 +09:00
David Ostrovsky
e9a5dcb2f2 Bazel: Bump bazel version to 1.0.0
Change-Id: Ib7cb505c55c24993c092fd1e38163c73ca741565
2019-10-10 19:08:05 +02:00
David Pursehouse
ddea3d3045 Merge "Upgrade JGit to 5.1.12.201910011832-r" into stable-2.16 2019-10-10 13:52:13 +00:00
Sven Selberg
15cee48e21 Syntax highlighting: associate *.cproj and *.xaml as xml
highlight.js doesn't seem to support these exact languages, but they
are xml so it's more useful than having no syntax hightlighting.

https://fileinfo.com/extension/csproj
https://fileinfo.com/extension/xaml

Change-Id: Ib5cb6678ac853928c688a08435b459c87d063641
2019-10-10 13:54:56 +02:00
David Pursehouse
0ac9b00369 Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
  Bazel: Fix building from non-root workspace directory

Change-Id: Ifbc2825bf3eedbf3d3c883484331b18276273895
2019-10-10 13:03:58 +09:00
David Pursehouse
6855d7b202 Set version to 3.0.4-SNAPSHOT
Change-Id: I8e16fbb3cff6609a347bcc7ab2587b7219ecbea3
2019-10-10 13:03:53 +09:00
David Pursehouse
5335db76eb Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
  Bazel: Fix building from non-root workspace directory

Change-Id: I1a28a8980d98f1c72cac3aa01c4f2fed6cc83450
2019-10-10 13:02:56 +09:00
David Pursehouse
5232dde46d Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Bazel: Fix building from non-root workspace directory

Change-Id: Id1f5c480fd346266157cfec21318c1f04ee4ac19
2019-10-10 13:02:20 +09:00
David Ostrovsky
adb2f7505b Bazel: Fix building from non-root workspace directory
Support for Remote Bazel Execution was added in this change:
Ia18e5fd55f8. However, the import statement in .bazelrc:

  import tools/remote-bazelrc

missed to prefix the tools directory with %workspace% prefix and
thus broke running the build from non root-workspace directory.

Change-Id: I85673659138e23d25eaecf40606d57706fe9f6e1
2019-10-10 13:01:11 +09:00
David Pursehouse
7bbd7b2ae1 Set version to 3.0.3
Change-Id: I7bea0ae9e1c17627d156e1828abda68d121a856f
v3.0.3
2019-10-10 08:42:20 +09:00
Paladox
53df2e9fff Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
  Highlight svg as xml
  Fix some corner cases with the download dropdown
  Update highlight.js

Change-Id: Iec2bc764162f42990b4ab089fb3cd782eb76a846
2019-10-09 20:43:38 +01:00
Paladox none
17051974d6 Highlight svg as xml
This is safe as its not executing the syntax rather its just highlighting.

Change-Id: Ia55c9634ecad4e5e7150df8010285c0172b2778a
2019-10-09 17:17:47 +00:00
Paladox none
71b15a22c2 Merge "Update highlight.js" into stable-2.16 2019-10-09 16:54:23 +00:00
Paladox none
794641c81e Merge "Fix some corner cases with the download dropdown" into stable-2.16 2019-10-09 16:30:28 +00:00
Paladox none
b55da6eb23 Fix some corner cases with the download dropdown
Corner cases fixed:

- Fixes support for File addition.
- Fixes left side content URL when diffing against
  non base revision, e.g. 2..3.
- Fixes support for File Deletion.
- Fixes support for File Renames.

Bug: Issue 11682
Change-Id: I8a91a8bfafad89fce7103a30a4fba91b4fdcdf99
2019-10-09 15:19:51 +00:00
Saša Živkov
49dcef02c2 Upgrade JGit to 5.1.12.201910011832-r
This JGit version brings significant performance improvement in the case when
Gerrit loads all external-ids from NoteDb. This happens whenever the
external_ids_map cache gets invalidated or expires.

With NoteDb containing about 70K external-ids we measured the following
times for loading all external-ids:
* Using JGit without [1]: 10 seconds
* Using JGit with [1]: 2 seconds

[1] https://git.eclipse.org/r/150254

Change-Id: I70c7f0d207ab9baa283fdda8432a2fc5e633553a
2019-10-09 17:16:34 +02:00
Paladox none
b8cd924850 Update highlight.js
Fixes we want:
- SVG is added as an alias to xml.js.
- JavaScript supports big number syntax now.
- cpp syntax highlighting improved.
- JSON gains support for highlighting comments.
- C++ gains more keywords.
- YAML improves matching keys.

Updates to commit 856acc94ec390e306756d752454a213b6b77f5bd

Change-Id: I71cc85567a103dbde3fd53c0bc30fdf2673d12fc
2019-10-09 15:01:07 +00:00
David Pursehouse
14bd040417 Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
  Docs: Set correct header level for Change Deleted

Change-Id: I28881f46340519f2b4b1d9bc3da031db968241b2
2019-10-09 20:18:35 +09:00
Sven Selberg
237f56dacb Docs: Set correct header level for Change Deleted
Change-Id: I67ad7b82d10cbb9268de8f6830a3984c1e10e760
2019-10-09 10:21:29 +02:00
Edwin Kempin
41c99c9086 CreateChange: Do not fail with ISE if base commit doesn't exist
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: If2886342815234d385e10d7ba7fe27127229ad4a
2019-10-09 09:51:49 +09:00
Edwin Kempin
05e5d34793 CreateChange: Do not fail with NPE if parent is given and target branch does not exist
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ib7c471dc1c541b08407a55504272b4e4c5e7c4b4
2019-10-09 09:51:49 +09:00
Edwin Kempin
6ccfa30fa2 CreateChange: Document that target branch must exist for merge commits
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ie86766dec0a597de97e43626eb6efe2500b461ce
2019-10-09 09:51:49 +09:00
Edwin Kempin
37df2c2705 CreateChange: Fix error message if non-existing branch is specified
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ib0ca36c268aceb4fdb9a92475f845b4f0d7a9cbd
2019-10-09 09:51:49 +09:00
Edwin Kempin
d058fcfa9d CreateChange: Reject creating merge commit on non-existing branch
Trying to create a change with a merge commit on a non-existing branch
(with the newBranch = true option) failed with a NullPointerException
[1]. If the target branch does not exist, creating a merge commit is not
possible and we should fail with a proper error message.

[1]
1569973285096-fa5fcf95" ]
java.lang.NullPointerException
  at org.eclipse.jgit.revwalk.RevWalk.markStart(RevWalk.java:320)
  at org.eclipse.jgit.revwalk.RevWalk.isMergedInto(RevWalk.java:436)
  at com.google.gerrit.server.git.MergeUtil.createMergeCommit(MergeUtil.java:437)
  at com.google.gerrit.server.restapi.change.CreateChange.newMergeCommit(CreateChange.java:486)
  at com.google.gerrit.server.restapi.change.CreateChange.createNewChange(CreateChange.java:318)
  at com.google.gerrit.server.restapi.change.CreateChange.applyImpl(CreateChange.java:185)
  at com.google.gerrit.server.restapi.change.CreateChange.applyImpl(CreateChange.java:101)
  at com.google.gerrit.server.update.RetryingRestCollectionModifyView.lambda$apply$1(RetryingRestCollectionModifyView.java:48)
  ...

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I8c40950ad8d3a09b1e1dd912ee26625a5b7c27b7
2019-10-09 09:51:49 +09:00
Edwin Kempin
2237d4885d Test creating a change on a non existing branch
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I97d9f05c44de8e50197a334a1bc040dd8617cd20
2019-10-09 09:51:49 +09:00
Edwin Kempin
6522f5f452 Document change.move config parameter
This config parameter allows to disable the Move Change REST endpoint.
It was added in change I26466e359 and was meant as a temporary measure
until we decide how to solve the issues with the move change
functionality (in particular issue 9877). However so far we didn't
follow up on this, hence we should better document this setting while
it's there and being used.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I4194c55800c4ef5c48b2ffc9bd6988baedcba89c
2019-10-09 09:51:49 +09:00
Edwin Kempin
dda85a9d44 CreateChange: Do not fail with 500 ISE if creating merge commit fails with NoMergeBaseException
NoMergeBaseException is thrown in 3 cases:

1. TOO_MANY_MERGE_BASES:
   The number of merge bases exceeds 200.

2. CONFLICTS_DURING_MERGE_BASE_CALCULATION:
   In order to find a single merge base it may required to merge
   together multiple common predecessors. If during these merges
   conflicts occur the merge fails with this reason.

3. MULTIPLE_MERGE_BASES_NOT_SUPPORTED:
   Multiple merge bases have been found (e.g. the commits to be merged
   have multiple common predecessors) but the merge strategy doesn't
   support this (e.g. ResolveMerge).

3. cannot happen because we always use a RecursiveMerger which does
support having multiple merge bases. If it happens anyway, that's an
error.

1. and 2. are not Gerrit errors, but the state of the input commits
don't allow us to create a merge commit. Hence in this situation we
should not fail with 500 Internal Server Error, but rather return 409
Conflict and let the user know what's the problem.

This change has a test for 1. that verifies that we return 409 Conflict
with a proper error message now.

I wasn't able to reproduce 2. from a test, but this is what we saw in
production at Google.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ia485e24c1bf3fc3e3857eb0669b67e11623f4a58
2019-10-09 09:51:49 +09:00
Edwin Kempin
d3e51d13c8 GetDiff: Remove weblinksOnly option
This option was only used by the GWT UI and is no longer needed.

Change-Id: I38516155ab771a2623a8dd39b256b1483d470c34
Signed-off-by: Edwin Kempin <ekempin@google.com>
2019-10-09 09:01:17 +09:00
David Pursehouse
0748e80180 Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
  Update rules_closure to latest version

Change-Id: I82e502b6d08eeb8929eaeed35f8a820d7808045b
2019-10-08 19:40:04 +09:00
David Pursehouse
992852bb1f Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
  Update rules_closure to latest version

Change-Id: If90850bd87e4fe38d60d099958fee621e2081b76
2019-10-08 19:36:45 +09:00
David Pursehouse
ae9f172e66 Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Update rules_closure to latest version

Change-Id: I9cb28071a6fb6b380c7ace926ff8b94ed1fc1919
2019-10-08 19:34:15 +09:00
David Pursehouse
98da057408 Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
  ElasticV7QueryProjectsTest: Use V7_4
  Add support for Elasticsearch version 7.4.*

Change-Id: I2f7ddd862910aaf34de1dd9695a391bb7e459708
2019-10-08 10:05:20 +09:00
David Pursehouse
dafca93528 ElasticV7QueryProjectsTest: Use V7_4
Change-Id: I224b5a8a3f4ecedb8c99b1d38f0c1c6a7efea8f0
2019-10-08 09:28:21 +09:00
Paladox
ceb2e2426c Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
  Add a copy button to copy the ssh key/gpg key

Change-Id: I2377dbad3f0c476a51181dc77082a037caff4698
2019-10-07 23:42:48 +01:00
David Ostrovsky
5626cd6777 Update rules_closure to latest version
The latest version updates protobuf version to 3.10.0: [1].

[1] https://github.com/bazelbuild/rules_closure/pull/413

Change-Id: Ib0aecd23a95f8834f3d06edd66af76a475d0ebb5
2019-10-07 23:35:37 +02:00
Marco Miller
91692f83c9 Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
  Add support for Elasticsearch version 7.4.*

Change-Id: Ic9bc8e16fc40e03e115c4a649fc3b4026ce1069a
2019-10-07 12:57:05 -04:00
Paladox none
e121d24d16 Add a copy button to copy the ssh key/gpg key
Bug: Issue 10047
Change-Id: If69f1a18065374000249b9157018c21024013085
2019-10-07 07:21:01 +00:00
David Ostrovsky
5c7e304200 Update git submodules
* Update plugins/delete-project from branch 'stable-3.0'
  to 4d09a5b63af0ee8a137fa01b144921a6db1570ee
  - Merge branch 'stable-2.16' into stable-3.0
    
    * stable-2.16:
      FilesystemDeleteHandler: Fix misused week year flagged by error prone
      Upgrade bazlets to latest stable-2.16 to build with 2.16.12 API
      Upgrade bazlets to latest stable-2.15 to build with 2.15.17 API
      .bazelrc: Update 'strict_action_env' flag
      Switch required bazel version to 0.29.1
      Make build tests name consistent with stable-2.15
      Upgrade bazlets to latest stable-2.16
      Upgrade bazlets to latest stable-2.15
      Bump required bazel version to 1.0.0rc2
      Upgrade bazlets to latest stable-2.14
      Upgrade bazlets to latest stable-2.15
      Upgrade bazlets to latest stable-2.14
      Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
      Upgrade bazlets to latest stable-2.16 to build with 2.16.11.1 API
      Upgrade bazlets to latest stable-2.15 to build with 2.15.16 API
      Upgrade bazlets to latest stable-2.15 to build with 2.15.15 API
      Upgrade bazlets to latest stable-2.16 to build with 2.16.10 API
      Upgrade bazlets to latest stable-2.16
      Upgrade bazlets to latest stable-2.15
      Upgrade bazlets to latest stable-2.14
      Upgrade bazlets to latest stable-2.15
      Upgrade bazlets to latest stable-2.14
      Upgrade bazlets to latest stable-2.16 to build with 2.16.9 API
      Upgrade bazlets to latest stable-2.15
      Upgrade bazlets to latest stable-2.14
      Align tests target name prefix with plugin name
      Upgrade bazlets to latest stable-2.15 to build with 2.15.14 API
      Upgrade bazlets to latest revision on stable-2.16
      Upgrade mockito-core to 2.28.2
      Make transitive starlark loads explicit
      Make transitive starlark loads explicit
    
    Change-Id: If70f8a70d96525645b0037b9d9978db5dba83047
    
  - Merge branch 'stable-2.15' into stable-2.16
    
    * stable-2.15:
      FilesystemDeleteHandler: Fix misused week year flagged by error prone
      Upgrade bazlets to latest stable-2.15 to build with 2.15.17 API
    
    Change-Id: I1a359dd758ffecfc10f149b90da33999e29b379b
    
  - FilesystemDeleteHandler: Fix misused week year flagged by error prone
    
    The recent error prone version 2.3.3, that is included in most recent
    Bazel@HEAD reports MisusedWeekYear pattern:
    
      Building plugins/delete-project/libdelete-project__plugin-class.jar
      FilesystemDeleteHandler.java:45: error: [MisusedWeekYear] \
      Use of "YYYY" (week year) in a date pattern without "ww"
      (week in year). You probably meant to use "yyyy" (year) instead.
      DateTimeFormatter.ofPattern("YYYYMMddHHmmss")
                                   ^
      (see https://errorprone.info/bugpattern/MisusedWeekYear)
    
    Bug: Issue 11658
    Change-Id: I17bbd72a57137e897a992280ee954aeba4d4c28c
    
  - Upgrade bazlets to latest stable-2.16 to build with 2.16.12 API
    
    Change-Id: Ie2cc612f5b7c0a4e7aaef07ffcca827979e9d206
    
  - Upgrade bazlets to latest stable-2.15 to build with 2.15.17 API
    
    Change-Id: I53097544777cc685bcf990107e0a2e0b400a4915
    
  - .bazelrc: Update 'strict_action_env' flag
    
    For the rationale see the change in gerrit core [1].
    
    IIUC:
    - The reason that '--action_env=PATH' is required is npm (Issue 10372),
    - which in turn was only needed because of PolyGerrit support,
    - which was not available in earlier stable branches than stable-2.16
      for this plugin.
    - From stable-3.0 onwards, delete-project is a core plugin and support
      for standalone builds were removed, and this Bazel flag isn't
      necessary any longer as it's taken from the main gerrit project.
    
    This means that when merging this upwards to stable-3.0 and beyond, this
    can be ignored.
    
    [1]: https://gerrit-review.googlesource.com/c/gerrit/+/238112
    
    Change-Id: Idad3a41eabb868b3f1b0f7115a90223105d64ee9
    
  - Merge branch 'stable-2.15' into stable-2.16
    
    * stable-2.15:
      Switch required bazel version to 0.29.1
      Make build tests name consistent with stable-2.15
    
    Change-Id: I3bacaa56df4d827b4a71d5b182280658f2bb71ac
    
  - Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14:
      Switch required bazel version to 0.29.1
      Make build tests name consistent with stable-2.15
    
    Change-Id: I9eb3db10a7c4d4624949b6b3759bccecaaf966ee
    
  - Switch required bazel version to 0.29.1
    
    Based on the corresponding core change series started with Ib48fdbb6.
    
    Change-Id: I9d2e3d32e426eaa4d4c768bb2dbdd76ae97e1bcc
    
  - Make build tests name consistent with stable-2.15
    
    Change-Id: I1b580a9e300ec8d0d12b94bf8299d9ffb821c345
    
  - Upgrade bazlets to latest stable-2.16
    
    Includes further fixes for --incompatible_disallow_legacy_java_provider.
    
    Change-Id: I09124f0999edb0086ae509de56ffaa0b05024ff2
    
  - Merge branch 'stable-2.15' into stable-2.16
    
    * stable-2.15:
      Upgrade bazlets to latest stable-2.15
      Bump required bazel version to 1.0.0rc2
      Upgrade bazlets to latest stable-2.14
    
    Change-Id: I8566c68c4e2cf777aafa7602e69d00618e583b19
    
  - Upgrade bazlets to latest stable-2.15
    
    Includes further fixes for --incompatible_disallow_legacy_java_provider.
    
    Change-Id: Ibece8324414affb6442a39caf9dcec1d7a37f4c0
    
  - Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14:
      Bump required bazel version to 1.0.0rc2
      Upgrade bazlets to latest stable-2.14
    
    Change-Id: I50790acf74d4832a8994b72e4b0768177fc5d960
    
  - Bump required bazel version to 1.0.0rc2
    
    Change-Id: I054b83b3df7d9fda5539f9e6ab43da6d2e665715
    
  - Upgrade bazlets to latest stable-2.14
    
    Includes further fixes for --incompatible_disallow_legacy_java_provider
    
    Change-Id: If209b2607558a4b253147bb37bdc6af7c39d1144
    
  - Merge branch 'stable-2.15' into stable-2.16
    
    * stable-2.15:
      Upgrade bazlets to latest stable-2.15
      Upgrade bazlets to latest stable-2.14
    
    Change-Id: I3eae342cdad7494df4b39c2e7c28a40258798906
    
  - Upgrade bazlets to latest stable-2.15
    
    Includes the following fixes:
    
    - Bazel: Add fixes for --incompatible_load_python_rules_from_bzl
    - Bazel: Export rules_python in plugin API
    - Support bazelisk or bazel in tools/eclipse/project.py
    - Rework imports in project.py
    - Update project.py to use argparse
    - Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
    
    Change-Id: If06e157079ef79120ef02b1023987d1f98451cf1
    
  - Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14:
      Upgrade bazlets to latest stable-2.14
    
    Change-Id: Iaf320d73afff61d7534830566e5981516bae1823
    
  - Upgrade bazlets to latest stable-2.14
    
    Includes the following fixes:
    
    - Bazel: Add fixes for --incompatible_load_python_rules_from_bzl
    - Bazel: Export rules_python in plugin API
    - Support bazelisk or bazel in tools/eclipse/project.py
    - Rework imports in project.py
    - Update project.py to use argparse
    - Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
    
    Also adds a .bazelversion file specifying version 0.29.0 which is
    used by bazelisk (if installed).
    
    Change-Id: If06e157079ef79120ef02b1023987d1f98451cf1
    
  - Merge branch 'stable-2.15' into stable-2.16
    
    * stable-2.15:
      Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
    
    Change-Id: If8e022e70be8942aa8c90b39c6fef790df1378e2
    
  - Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14:
      Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
    
    Change-Id: I920ed0e4f6eba4cc45ee696a338a91c37f2f03a1
    
  - Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
    
    Change-Id: Ia8fd326989b34705557f5188c07c1035bf6628e4
    
  - Upgrade bazlets to latest stable-2.16 to build with 2.16.11.1 API
    
    Change-Id: I368123793bd78f7353d117c32f6a705397c662f0
    
  - Merge branch 'stable-2.15' into stable-2.16
    
    * stable-2.15:
      Upgrade bazlets to latest stable-2.15 to build with 2.15.16 API
      Upgrade bazlets to latest stable-2.15 to build with 2.15.15 API
    
    Change-Id: I361db3a687168c8222d09e19149a3528678f017d
    
  - Upgrade bazlets to latest stable-2.15 to build with 2.15.16 API
    
    Change-Id: Ic10b50eebfe0aae23517e50013b937f63e99014b
    
  - Upgrade bazlets to latest stable-2.15 to build with 2.15.15 API
    
    Change-Id: Ia0a7c7754fa077eae2fbc0f1c1fa4cb6df3b6350
    
  - Upgrade bazlets to latest stable-2.16 to build with 2.16.10 API
    
    Change-Id: I3a276ac33e46f8db865abb1cd537ef56bd6a4eea
    
  - Merge branch 'stable-2.15' into stable-2.16
    
    * stable-2.15:
      Upgrade bazlets to latest stable-2.15
      Upgrade bazlets to latest stable-2.14
      Upgrade bazlets to latest stable-2.15
      Upgrade bazlets to latest stable-2.14
    
    Change-Id: I6bb325a92cbe62d470b109be3dfe137a2643cb84
    
  - Upgrade bazlets to latest stable-2.16
    
    - download_file.py: Synchronize curl options with gerrit core
    - Bazel: Make build tool chain forward compatible
    
    Change-Id: Ic57b35e489a4a95a2e8a259741c79d38ba657047
    
  - Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14:
      Upgrade bazlets to latest stable-2.14
    
    Change-Id: I6d55c04b7f2575ad76574eeedef56d5803cb1272
    
  - Upgrade bazlets to latest stable-2.15
    
    - download_file.py: Synchronize curl options with gerrit core
    
    Change-Id: Ic57b35e489a4a95a2e8a259741c79d38ba657047
    
  - Upgrade bazlets to latest stable-2.14
    
    - download_file.py: Synchronize curl options with gerrit core
    
    Change-Id: Ic57b35e489a4a95a2e8a259741c79d38ba657047
    
  - Upgrade bazlets to latest stable-2.15
    
    Change-Id: I590c7c1129a08932b1c5e91a79a503cad345f162
    
  - Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14:
      Upgrade bazlets to latest stable-2.14
    
    Change-Id: I5e1c7469bd43468ac0042e7fa93997023ae5c4f6
    
  - Upgrade bazlets to latest stable-2.14
    
    Change-Id: I4ed9d2aa8b3d3a7e008a770504e1004dd31c8a9f
    
  - Upgrade bazlets to latest stable-2.16 to build with 2.16.9 API
    
    Change-Id: Id94b6587b12653b3c4bab9eb9f44d10bf95061e3
    
  - Merge branch 'stable-2.15' into stable-2.16
    
    * stable-2.15:
      Upgrade bazlets to latest stable-2.15
      Upgrade bazlets to latest stable-2.14
    
    Change-Id: I7b8c2ea4ae23ced880334c9116165c6002d23f52
    
  - Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14:
      Upgrade bazlets to latest stable-2.14
    
    Change-Id: Ib0d3546cf4fd364cdd77ad03a9ae39808f8473dd
    
  - Upgrade bazlets to latest stable-2.15
    
    - Bazel: Remove iteration over depset
    
    Change-Id: Iffb4fda899eeb64847f244953d9bcb3b044cfe54
    
  - Upgrade bazlets to latest stable-2.14
    
    - Bazel: Remove iteration over depset
    
    Change-Id: Iffb4fda899eeb64847f244953d9bcb3b044cfe54
    
  - Merge branch 'stable-2.15' into stable-2.16
    
    * stable-2.15:
      Align tests target name prefix with plugin name
      Upgrade bazlets to latest stable-2.15 to build with 2.15.14 API
    
    Change-Id: Icbb2fd10cb193f8f9839a28789c8c18668d22f04
    
  - Align tests target name prefix with plugin name
    
    Change-Id: Ia6cd289280b7b2fdf46ca49ccb0dd1485edd56a4
    
  - Upgrade bazlets to latest stable-2.15 to build with 2.15.14 API
    
    Change-Id: I77ca8189cb4af489d25137c1a19b4d6c013ac1e8
    
  - Merge branch 'stable-2.15' into stable-2.16
    
    * stable-2.15:
      Upgrade mockito-core to 2.28.2
      Make transitive starlark loads explicit
      Make transitive starlark loads explicit
    
    Change-Id: I581f49e28b7c842469cb5e7199925c9f4aff4263
    
  - Upgrade bazlets to latest revision on stable-2.16
    
    Includes the following changes to fix the build with Bazel 0.25:
    
    - Make transitive starlark loads explicit
    - Update rules_closure to latest version
    - polygerrit_plugin: Demote compilation level to whitespace only
    
    Also update local build files to make transitive starlark loads
    explicit.
    
    Bug: Issue 10694
    Bug: Issue 10855
    Change-Id: I480b5a929a48ce327daf95d7f74e167e50aeed6d
    
  - Upgrade mockito-core to 2.28.2
    
    Change-Id: I2be328c62e3b20d3ebbe230637808e87dea3fcf5
    
  - Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14:
      Make transitive starlark loads explicit
    
    Change-Id: I53c81d68d4be813e6bdfa230aea8a71cbadf5f6b
    
  - Make transitive starlark loads explicit
    
    This fixes the build with bazel 0.25.
    
    Bug: Issue 10855
    Change-Id: I480b5a929a48ce327daf95d7f74e167e50aeed6d
    
  - Make transitive starlark loads explicit
    
    This fixes the build with bazel 0.25.
    
    Bug: Issue 10855
    Change-Id: I480b5a929a48ce327daf95d7f74e167e50aeed6d
2019-10-05 15:40:21 +00:00
Paladox
cab4550fca Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
  Add support for downloading binary files
  gr-dropdown: Prevent adding base url twice in _computeURLHelper
  Update highlight.js

Change-Id: I833e68885d5e146d1d01cb976c7badd1cc204d72
2019-10-04 16:58:58 +01:00
Paladox none
a504f95600 Merge "Add support for downloading binary files" into stable-2.16 2019-10-04 15:57:53 +00:00
Ben Rohlfs
1e5c007909 Merge "gr-dropdown: Prevent adding base url twice in _computeURLHelper" into stable-2.16 2019-10-04 15:53:02 +00:00
Paladox none
45913eb5a5 Add support for downloading binary files
This change uses a dropdown to be able to download either
the patch, left side content or right side content.

Screenshot: https://imgur.com/a/D2ffRX7

Bug: Issue 6029
Bug: Issue 7867
Change-Id: I4e05dba0dcfaf8699e20f151a6949ffb08701bbe
2019-10-04 11:48:41 +00:00
Paladox none
b77e26cae3 gr-dropdown: Prevent adding base url twice in _computeURLHelper
This will be used to prevent adding a base url twice to a path,
it will be used by the download binary dropdown change done in [1].

Because one of the function uses changeBaseURL it adds the base url
already.

[1] I4e05dba0dcfaf8699e20f151a6949ffb08701bbe

Bug: Issue 6029
Change-Id: I6f2eff09bd4a4581926fcdce4ceb03ed2e1afc85
2019-10-04 12:47:02 +01:00