Commit Graph

4614 Commits

Author SHA1 Message Date
Filipa Lacerda 28f13d0456 Add space between words in language dropdown 2017-07-24 07:33:09 +00:00
Nick Thomas 4bda5b502d Short-circuit build coverage extraction for empty regexes 2017-07-22 07:12:19 +01:00
Grzegorz Bizon d950e4d937 Merge branch 'zj-pipeline-badge-improvements' into 'master'
Pipeline badge improvements

Closes #15582 and #20961

See merge request !12966
2017-07-22 05:36:02 +00:00
Nick Thomas 000ddc96c5 Fix the gcovr coverage regex by removing line separators before scanning
RE2 differs from Ruby in handling multiple-line strings. The string "foo\n"
will not match the regular expression "foo$" unless multi-line mode is enabled
(and it's off by default).

Since we're already scanning the build trace line by line (and so multi-line
coverage regular expressions won't work), we can fix this by removing the line
separator before scanning the string.
2017-07-21 22:08:23 +01:00
Rémy Coutable 8efc884166 Merge branch 'gitaly-tree-entries' into 'master'
Incorporate CommitService.GetTreeEntries Gitaly call

Closes gitaly#372

See merge request !12941
2017-07-21 15:47:36 +00:00
Robert Speicher 1ce523c133 Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'
Migrate Gitlab::Git::Commit.find_all to Gitaly

Closes gitaly#396

See merge request !12934
2017-07-21 14:28:48 +00:00
Robert Speicher d0da585233 Merge branch 'improve-ee-compat-check' into 'master'
Developer can just download the patch from the `ee_compat_check` job's artifact

See merge request !12967
2017-07-21 14:06:27 +00:00
Sean McGivern 8348141434 Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'
Fix an infinite loop in Gitlab:UntrustedRegexp

See merge request !2146
2017-07-21 13:13:07 +01:00
Z.J. van de Weg 8877f2e8c1 Reword success to passing for pipeline badges 2017-07-21 10:22:11 +02:00
Z.J. van de Weg 2086483b24 Rename build to pipeline for status badges
First commit in probably 2, for resolve gitlab-org/gitlab-ce#15582. This
commit is renaming files and classes from build to pipeline. Also
wording is editted to pipeline. Given `pipeline` had more characters
than `build`, I've made the field a bit wider. The width now matchers
the one for the coverage badge, so they look nice when in a table
format, or in a list.

As soon as this commit is merged to master, and released, the build.svg
is deprecated, meaning that all users which already placed a badge
should update it. However, to make sure it keeps working tests are added
for this case.
2017-07-21 10:22:09 +02:00
Ahmad Sherif b043100b65 Migrate Gitlab::Git::Commit.find_all to Gitaly
Closes gitaly#396
2017-07-20 22:03:55 +02:00
Alejandro Rodríguez 9eb5cdd73f Incorporate CommitService.GetTreeEntries Gitaly call 2017-07-20 12:47:00 -04:00
Alexander Randa e0ab5618a0 Wrong data type when testing webhooks 2017-07-20 15:12:06 +00:00
Robert Speicher ca80d589a6 Merge branch 'feature/send-diff-limits-to-gitaly' into 'master'
Migrate DiffCollection limiting logic to Gitaly

See merge request !12867
2017-07-20 14:31:06 +00:00
Rémy Coutable b80e6d7c17 Merge branch 'migration-status' into 'master'
Add option to specify migration status on at the migration site

See merge request !12976
2017-07-20 14:13:24 +00:00
Kamil Trzciński 542b675cf6 Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'
Fix docker tag reference routing constraints

Closes #35220 and gitlab-com/support-forum#2246

See merge request !12961
2017-07-20 11:50:21 +00:00
Kamil Trzciński 4766a77b1d Merge branch 'feature/gb/auto-retry-failed-ci-job' into 'master'
Make it possible to auto retry a failed CI/CD job

Closes #3442

See merge request !12909
2017-07-20 11:25:54 +00:00
Yorick Peterse 001dd56e7b Merge branch 'backstage/gb/build-stage-id-ref-bg-migration-cleanup' into 'master'
Implement build stage_id reference migration clean up

Closes #34893

See merge request !12785
2017-07-20 10:10:36 +00:00
Douwe Maan ba60d4f6e4 Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'
24570 use re2 for user supplied regexp 9 3

See merge request !2129
2017-07-19 22:28:41 -05:00
Sean McGivern b042765d2f Merge branch '34563-usage-ping-github' into 'master'
Add github imported projects count to usage data

Closes #34563

See merge request !12959
2017-07-19 16:15:50 +00:00
Ahmad Sherif ef2b81adb4 Migrate DiffCollection limiting logic to Gitaly 2017-07-19 18:05:22 +02:00
Andrew Newdigate 5d238ae819 Add option to specify migration status on at the migration site 2017-07-19 16:40:25 +01:00
Robert Speicher 55b981343b Merge branch '35034-fix-unstranslated-visibility-levels' into 'master'
Always return the translated level name.

Closes #35034

See merge request !12852
2017-07-19 14:03:59 +00:00
Jarka Kadlecova 2cc063e592 Add github imported projects count to usage data 2017-07-19 15:22:05 +02:00
Rémy Coutable 0160aeed0a
Merge branch 'htve/gitlab-ce-34880_add_ukrainian_translations_to_i18n'
See merge request !12744.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-19 13:50:02 +02:00
Grzegorz Bizon 98f5c00e7a Merge branch 'master' into backstage/gb/build-stage-id-ref-bg-migration-cleanup
* master: (59 commits)
  Resolve "Clarify k8s service keys"
  Add Portuguese Brazil translations of Commits Page & Pipeline Charts
  Add Japanese Translation to i18n
  Update Prometheus gem to version that explicitly calls `munmap`
  Simplify width for dropdown-menu on mobile
  Update CHANGELOG.md for 9.3.7
  Remove developer documentation about not describing symbols
  Incorporate Gitaly's Commits#between RPC
  Adapt to new Gitaly commit message format
  Remove transitions on nav link hover
  Provide option to trigger build only for official CE and EE repos in .com
  Fix queries duration sorting in Performance Bar
  Rename Project nav items
  Add structured logging for Rails processes
  Disable Rails logging in CI test environments
  Fix download artifacts button alignment
  Update avatar border to be opaque for better stacking
  Fixed typos
  Fix typos
  Fix external issue trackers redirect
  ...

Conflicts:
	db/schema.rb
2017-07-19 13:21:01 +02:00
Rémy Coutable 2ddcb1f1a6 Merge branch '34881_add_russian_translations_to_i18n' into 'master'
Add Russian Translations To I18N

Closes #34881

See merge request !12743
2017-07-19 11:13:45 +00:00
Huang Tao 1e66907971 Add Japanese Translation to i18n 2017-07-19 10:47:41 +00:00
Grzegorz Bizon 23223ba64e Do not allow to auto-retry a job more than 2 times 2017-07-19 11:27:49 +02:00
Rémy Coutable f9f33323aa
Developer can just download the patch from the `ee_compat_check` job's artifact
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-19 11:11:26 +02:00
Sean McGivern fca7a77a23 Merge branch 'bvl-free-system-namespace' into 'master'
Free `system` namespace by moving uploads into `uploads/-`

Closes #33550

See merge request !12917
2017-07-19 09:09:15 +00:00
Paweł Chojnacki 2c3d52161a Update Prometheus gem to version that explicitly calls `munmap` 2017-07-19 08:54:39 +00:00
Grzegorz Bizon 59c808a636 Add a test for container repository name regexp 2017-07-19 10:52:03 +02:00
Sean McGivern 1c7893c5c1 Merge branch 'rc/bump-peek-performance_bar' into 'master'
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch

See merge request !12939
2017-07-19 08:52:01 +00:00
Rémy Coutable 1314b79d93 Merge branch 'gitaly-commits-between' into 'master'
Gitaly commits between

Closes gitaly#350

See merge request !12669
2017-07-19 08:51:22 +00:00
Grzegorz Bizon 9f36012e02 Fix docker tag reference routing constraints 2017-07-19 10:30:57 +02:00
Alejandro Rodríguez 25b01b4c85 Incorporate Gitaly's Commits#between RPC 2017-07-18 16:20:27 -04:00
Alejandro Rodríguez 90f8feae46 Adapt to new Gitaly commit message format 2017-07-18 16:11:44 -04:00
Rémy Coutable 3dcd3df531
Fix queries duration sorting in Performance Bar
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-18 19:00:46 +02:00
Bob Van Landuyt 6f26f6f79f Allow groups with the name system 2017-07-18 16:23:38 +02:00
Bob Van Landuyt c156030ef9 Add a background migration to rename `uploads` in the uploads table 2017-07-18 15:38:54 +02:00
Kamil Trzciński 11f9ac0a48 Merge branch 'backstage/gb/add-index-and-foreign-key-to-merge-requests' into 'master'
Add a foreign key to `merge_requests.head_pipeline_id`

Closes #34065

See merge request !12837
2017-07-18 13:09:25 +00:00
Rémy Coutable f3e682c03f Merge branch 'request-store-wrap' into 'master'
Add RequestCache to cache via RequestStore

See merge request !12920
2017-07-18 12:09:47 +00:00
Rémy Coutable 66c7f51897
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-18 13:56:36 +02:00
Lin Jen-Shin 3922b80329 Rename the methods to make it fit with current name 2017-07-18 18:04:20 +08:00
Lin Jen-Shin ffc5b29bd0 Follow feedback on the merge request 2017-07-18 17:48:48 +08:00
Grzegorz Bizon 5cd6f8c76e Add a foreign key to `merge_requests.head_pipeline_id` 2017-07-18 10:51:19 +02:00
Grzegorz Bizon 2930c0e3d0 Remove obsolete argument from bg migrations code 2017-07-18 10:43:12 +02:00
Andrew Newdigate a89f18bf2c Renamed Gitaly services 2017-07-18 07:59:36 +00:00
Lin Jen-Shin 76c9f071db Update the comments for the new functionality 2017-07-18 01:30:58 +08:00