Grzegorz Bizon
df25c19699
Use Ci config validation helpers only where needed
2016-06-07 12:58:32 +02:00
Grzegorz Bizon
6bd67f5212
Do not process new Ci config entry when invalid
2016-06-07 12:48:26 +02:00
Grzegorz Bizon
e8f995ef26
Pass root Ci config entry to each subsequent entry
2016-06-07 12:13:22 +02:00
Grzegorz Bizon
69a3755c5a
Add Ci config entry that implements Null Object
2016-06-07 11:58:02 +02:00
Grzegorz Bizon
b95c60a071
Do not process Ci config node when node is a leaf
2016-06-07 11:26:39 +02:00
Grzegorz Bizon
940763e0e7
Use CI config errors from new processor in legacy one
2016-06-06 20:56:58 +02:00
Grzegorz Bizon
a3c0745514
Collect errors from all nodes in new CI config
2016-06-06 11:59:25 +02:00
Grzegorz Bizon
6dbd1c86a8
Validate new before script CI configuration entry
2016-06-06 11:33:45 +02:00
Grzegorz Bizon
251dd571df
Extract CI config validation helpers to mixin
2016-06-06 11:05:15 +02:00
Grzegorz Bizon
8048dcc8e6
Implement CI configuration nodes tree processing
2016-06-06 10:43:11 +02:00
Grzegorz Bizon
7f2f683eeb
Rename ci config module that holds nodes to Node
2016-06-06 09:24:16 +02:00
Grzegorz Bizon
6609589b93
Add ci config global and before_script entries
2016-06-06 09:05:00 +02:00
Grzegorz Bizon
23030439c2
Rename class that loads CI configuration to Loader
2016-06-06 08:20:55 +02:00
Grzegorz Bizon
d2b708ac43
Extract CI config YAML parser to a separate class
...
With this approach it would be easier to add different sources of
configuration, that we do not necessairly have to be in YAML format.
2016-06-03 21:10:50 +02:00
Grzegorz Bizon
d501850e05
Add gitlab ci configuration class that holds hash
...
As for now, we keep this class inside a oryginal config processor class.
We will move implementation to this class and delegate to it from
current config processor.
After original gitlab ci yaml processor not longer has relevant
impelemntation we will replace it with new configuration class.
2016-06-03 14:20:34 +02:00
Robert Speicher
3d3c9c75aa
Merge branch 'style/enable-semicolon-rubocop-cop' into 'master'
...
Enable Style/Semicolon rubocop style cop
Don't use semicolons to terminate expressions.
See #17478 .
See merge request !4351
2016-06-01 17:41:19 +00:00
Douwe Maan
2d084dd848
Merge branch 'separate-banzai-references' into 'master'
...
Separate reference gathering from rendering
This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query.
cc @rspeicher @DouweM
See merge request !3969
2016-06-01 15:51:59 +00:00
Douwe Maan
4a50e1f051
Merge branch 'current-settings-use-request-store-during-request'
2016-06-01 12:55:00 +02:00
Rémy Coutable
46ac3107a4
Merge branch 'issue_15557' into 'master'
...
Fix error 500 when sorting issues by milestone due date and filtering by labels
fixes #15557
See merge request !4327
2016-06-01 08:42:36 +00:00
Dmitriy Zaporozhets
cb261abee1
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2016-06-01 11:34:45 +03:00
Grzegorz Bizon
face87b7bb
Enable Style/Semicolon rubocop style cop
...
See #17478
2016-06-01 08:45:14 +02:00
Felipe Artur
56f3b243ce
Add leading comment space cop
2016-05-31 19:33:46 -03:00
Robert Speicher
613bcdc626
Merge branch 'data_leak' into 'master'
...
Confidential notes data leak
Fixes part of https://gitlab.com/gitlab-org/gitlab-ee/issues/575
See merge request !1967
2016-05-31 19:35:13 +00:00
Valery Sizov
9154586ce5
Confidential notes data leak
2016-05-31 21:32:53 +03:00
Kamil Trzcinski
846d111f1d
Add Application Setting to configure Container Registry token expire delay (default 5min)
2016-05-31 13:23:13 +02:00
Robert Speicher
ea32937630
Merge branch 'rubocop/enable-literal-in-condition-cop' into 'master'
...
Enable Lint/LiteralInCondition rubocop cop
Detects literals used in conditions.
See #17478
See merge request !4354
2016-05-30 17:56:15 +00:00
Grzegorz Bizon
86cf9dd253
Enable Lint/LiteralInCondition rubocop cop
...
Checks of literals used in conditions.
See #17478
2016-05-30 12:34:25 +02:00
Grzegorz Bizon
0ea017d997
Enable Style/WhileUntilDo rubocop style cop
...
See #17478
2016-05-30 11:37:14 +02:00
DJ Mountney
c8eb1dccab
Try and use cache for application settings even when the db is not connected
2016-05-29 12:53:30 -07:00
DJ Mountney
78d8458773
Only use RequestStore for current_application_settings during a request
...
This fixes an issue where the RequestStore was being populated with the settings in the unicorn master
during the rails initializers. Each forked worker would then start their first request with an uncleaned RequestStore.
2016-05-27 14:28:04 -07:00
Robert Speicher
1d2d67b9e3
Merge branch 'fix/gitlab-importer-issue' into 'master'
...
Fix gitlab importer issue
Fixed credentials not being called correctly - probably some bad refactoring or search & replace...
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565
See merge request !4301
2016-05-26 21:36:01 +00:00
Yorick Peterse
9bdfc98242
Merge branch 'measure-proxy-timing' into 'master'
...
Measure proxy flight time
See merge request !4278
2016-05-26 17:05:26 +00:00
Jacob Vosmaer
5771114f9b
Rename metric to 'rails queue duration'
2016-05-26 17:53:21 +02:00
Yorick Peterse
86166d2802
Split Markdown rendering & reference gathering
...
This splits the Markdown rendering and reference extraction phases into
two distinct code bases. The reference extraction phase no longer relies
on the html-pipeline Gem (and any related code) and allows for
extracting of references from multiple HTML nodes in a single pass. This
means that if you want to extract user references from 200 comments you
no longer need to run 200 times N number of queries, instead only a
handful of queries may be needed.
2016-05-26 17:14:00 +02:00
Yorick Peterse
94d5416db6
Added Gitlab::Lazy
...
This class can be used to lazy-evaluate blocks of code the first time
they're called. This can be useful when a method performs a certain
heavy operation (e.g. a SQL query) that you only want to perform
whenever the result is used for the first time.
2016-05-26 13:58:01 +02:00
James Lopez
bf484ffee4
fix bad refactoring of import data credentials
2016-05-26 11:25:35 +02:00
Jacob Schatz
3d009f7785
Merge branch 'updated-contrib-calendar' into 'master'
...
POC: Updated contrib calendar
In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it?

cc. @jschatz1
See merge request !3944
2016-05-25 23:29:41 +00:00
Douwe Maan
99cd419132
Merge branch 'fix/import-url-uri-issue' into 'master'
...
Fix for import URL URI problem when URL contains a space
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17559
Prevents an already encoded URL to be encoded again - preventing %20 => %25%20
See merge request !4180
2016-05-25 20:48:30 +00:00
Felipe Artur
5273335247
Fix forks creation when visibility level is restricted
2016-05-25 10:57:00 -04:00
Jacob Vosmaer
c049534da6
Align class name with field name
2016-05-25 14:55:23 +02:00
Jacob Vosmaer
3c785a761c
Send data to InfluxDB instead of stdout
2016-05-25 14:28:21 +02:00
Jacob Vosmaer
cee07c5919
Measure proxy timing: needs influxdb code
2016-05-24 17:07:41 +02:00
Robert Speicher
51c167eeb7
Enable Performance/RangeInclude cop and fix single offense
2016-05-23 13:10:42 -04:00
James Lopez
d83ce65c1a
fix changelog and merge
2016-05-23 09:11:21 +02:00
Grzegorz Bizon
7f9092da1e
Extend comment for migrations helper MySQL fix
2016-05-22 23:31:33 +02:00
Grzegorz Bizon
2df8b48dbb
Add MySQL compatibility fix in migration helpers
2016-05-22 22:44:59 +02:00
Douwe Maan
ec86644545
Merge branch 'zj-gitignore-dropdown'
2016-05-20 17:14:22 -05:00
Douwe Maan
fc1910ddc5
Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'
...
# Conflicts:
# app/services/system_note_service.rb
2016-05-20 16:23:04 -05:00
Zeger-Jan van de Weg and Alfredo Sumaran
79620c501d
Update API and fetching task
2016-05-20 15:58:36 -05:00
Zeger-Jan van de Weg and Alfredo Sumaran
e166a8022a
Backend for a gitignores dropdown
2016-05-20 15:58:36 -05:00