28c23d99c1
Merge branch '25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-exist' into 'master'
...
Resolve "`Gitlab::Checks::ChangeAccess` looks for user permissions that don't exist"
Closes #25018
See merge request !8551
2017-01-14 21:35:51 +00:00
bf8e174f0a
Merge branch '26587-metrics-middleware-endpoint-is-nil' into 'master'
...
Resolve "Metrics middleware: endpoint is nil"
Closes #26587
See merge request !8544
2017-01-14 02:58:41 +00:00
a532c6040c
Allow to use ENV variables in redis config
2017-01-13 10:41:50 +05:00
892ff3a3ae
Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route
...
`endpoint.route` is calling `env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info]`
but `env[Grape::Env::GRAPE_ROUTING_ARGS]` is `nil` in the case of a 405 response
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-12 23:15:25 -05:00
0b5b3ec3a4
Remove useless permission checks in Gitlab::Checks::ChangeAccess
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-12 17:37:14 -05:00
3eebca7b5c
Merge branch 'use-configured-git' into 'master'
...
Use configured git rather thans system git
See merge request !8460
2017-01-12 18:27:33 +00:00
764fc0dd69
Merge branch 'zj-unadressable-url-variables' into 'master'
...
Do not check for valid url for .gitlab-ci.yml
Closes #22970
See merge request !8451
2017-01-12 18:19:11 +00:00
3c9a3918e6
Merge branch 'search-bar-first-iteration' into 'master'
...
Search bar first iteration
Closes #21747
See merge request !7345
2017-01-12 14:57:57 +00:00
f986b4c4e5
Add support for PlantUML diagrams in Asciidoc.
...
This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a
PlantUML diagram all we need is to include a plantuml block like:
```
[plantuml, id="myDiagram", width="100px", height="100px"]
--
bob -> alice : ping
alice -> bob : pong
--
```
The plantuml block is substituted by an HTML img element with *src* pointing to
an external PlantUML server.
This MR also add a PlantUML integration section to the Administrator -> Settings
page to configure the PlantUML rendering service and to enable/disable it.
Closes : #17603
2017-01-12 10:04:52 +00:00
cff423449f
Fix Rubocop offenses in LDAP related code and spec
2017-01-10 14:31:21 +01:00
f20875ec45
Add username to gon
2017-01-09 16:00:53 -06:00
6056903265
Merge branch 'feature/log-ldap-to-application-log' into 'master'
...
Log LDAP blocking/unblocking events to application log
See merge request !8042
2017-01-09 13:39:19 +00:00
c28b0a539d
Don't instrument 405 Grape calls
...
Fixes #26051 .
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-09 10:02:52 +01:00
de4eee0894
LDAP attributes needs default values
2017-01-06 00:24:33 -06:00
6ef6f9f205
Do not check for valid url for .gitlab-ci.yml
...
Until this commit, GitLab would check if the URL in your .gitlab-ci.yml
would be valid and adressable. However, this approach is rather limited.
To begin, the URL couldn't be http://example:$PORT/my-project , as the
PORT value would be interpolated after checking if the URL was valid,
which its not. Also this gem will limit the amount of protocols allowed.
This commit doesn't check, at all, if the URL is valid. This is now the
responsablilty of the user. In my opion this is right, as the user
ultimately benefits from a correct URL, but also, its impossible to
cover all cases.
2017-01-05 19:59:10 +01:00
22a34c81aa
Use configured git rather than system git
2017-01-05 13:46:26 +01:00
2e20a71d21
Ensure internal Gitlab::Git references use the namespace
2017-01-04 19:09:29 -05:00
a00578ce5c
Absorb gitlab_git
2017-01-04 19:09:28 -05:00
115aac77f6
Merge branch 'ldap_person_attributes' into 'master'
...
Gitlab::LDAP::Person uses LDAP attributes configuration
Closes #26290
See merge request !8418
2017-01-03 21:11:10 +00:00
babb7d5260
Gitlab::LDAP::Person uses LDAP attributes configuration
...
We allow users to configure LDAP attribute preferences. For example,
email can be configured to use `mail`, `email` and `userPrincipalName`,
falling through to the next until a value is found. Prior to this
change, Gitlab::LDAP::Person did not honor this configuration. Now,
the class will honor `name` and `mail` configuration. It does not
handle `username`, or fallback to `first_name` + `last_name` in the
absence of `name`.
2017-01-03 13:26:47 -06:00
447314c0f3
Merge branch 'zj-revert-polymorphic-url' into 'master'
...
Revert specific URL
See merge request !8321
2017-01-03 15:52:30 +00:00
112f470572
Fix cross-project references copy to include the project reference
...
Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
2017-01-03 13:01:46 +01:00
293eed4d63
Merge branch 'issues/8081' into 'master'
...
Issues/8081
See merge request !7908
2016-12-27 19:44:57 +00:00
20afb4c69e
Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master'
...
Allow to add deploy keys with write-access
Closes #1376
See merge request !7383
2016-12-27 15:00:49 +00:00
d6a37a8cef
Merge branch 'bugfix/outlook-language-parsing' into 'master'
...
Switch to Discourse's EmailReplyTrimmer for more robust reply parsing
See merge request !7473
2016-12-27 14:46:47 +00:00
07f0486cf8
Merge branch '25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file' into 'master'
...
Resolve "Gitlab merge request view crash when commiting a js sourcemap file"
Closes #25931
See merge request !8310
2016-12-27 12:10:20 +00:00
fe60079454
Merge branch 'auto-deploy-with-space' into 'master'
...
Rename "autodeploy" to "auto deploy"
Closes #25999
See merge request !8289
2016-12-27 10:52:04 +00:00
1955bcaa22
Revert specific URL
2016-12-27 10:43:23 +01:00
1e5e56c698
Fix MR with files hidden by .gitattributes
...
Don't try to highlight and cache files hidden by .gitattributes entries.
2016-12-26 16:25:55 +00:00
db8ee6672c
Rename "autodeploy" to "auto deploy"
2016-12-23 11:08:18 +01:00
b7894a7451
Fix errorcode 500 on slash commands
...
Coverage was failing, so this could slip through the cracks
2016-12-23 09:46:32 +01:00
7218daaa96
fix guard style
2016-12-22 00:10:35 -08:00
68d89aa96b
Merge branch 'adam-auto-deploy' into 'master'
...
Auto deploy
Closes #23580
See merge request !8135
2016-12-21 21:34:45 +00:00
1b8a576d3f
Be more certain in the comment
2016-12-21 09:51:42 -08:00
f02f238d52
Revert "allow empty-quotes"
...
This reverts commit 4f2f678aff8d7dfcac96c47cf7eb480a5707ddaf.
2016-12-21 09:51:42 -08:00
5603127699
remove comment attribution
2016-12-21 09:51:41 -08:00
602c319862
allow empty-quotes
2016-12-21 09:51:41 -08:00
017579fe14
protect against EmailReplyTrimmer returning nil
2016-12-21 09:51:41 -08:00
03753ff146
remove trailing whitespace from email bodies
2016-12-21 09:51:41 -08:00
a3bb2463c4
switch to email_reply_trimmer from discourse
2016-12-21 09:51:39 -08:00
c9fdf739b2
Merge branch '25908-fix-grape-after-update' into 'master'
...
Use Grape's new Route methods
See merge request !8223
2016-12-21 15:53:19 +00:00
9809a9af8a
Introduce "Set up autodeploy" button to help configure GitLab CI for deployment
...
The button allows to choose a ".gitlab-ci.yml" template that automatically
sets up the deployment of an application.
The currently supported template is Kubernetes template.
2016-12-21 16:21:55 +01:00
6e8ba3b79f
Merge branch 'fix/group-path-rename-error' into 'master'
...
Fix error 500 renaming group. Also added specs and changelog.
Closes #17922 and #23223
See merge request !8201
2016-12-21 14:54:02 +00:00
7e5deb6abe
Merge branch 'multipart-uploaded-file' into 'master'
...
Inject ::UploadedFile from Multipart middleware
Closes #25888
See merge request !8215
2016-12-21 13:38:04 +00:00
90c6a1a319
Use Grape's new Route methods
...
- Use Route#request_method instead of Route#route_method
- Use Route#path instead of Route#route_path
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-21 13:46:52 +01:00
4ec259fd36
Inject ::UploadedFile from Multipart middleware
...
I mistakenly concluded Rack::Multipart injects File instances into the
params. These should be UploadedFile instances. This reuses a mock
UploadedFile class we already had in GitLab.
2016-12-21 13:07:53 +01:00
5452747729
Fix error importing label priorities and added relevant spec
2016-12-21 10:33:20 +01:00
bd0c171c55
fixup! Log messages when blocking/unblocking LDAP accounts
2016-12-20 19:54:37 +01:00
e87e280598
Log messages when blocking/unblocking LDAP accounts
2016-12-20 19:51:45 +01:00
b82fdf6257
Fix error 500 renaming group. Also added specs and changelog.
2016-12-20 17:52:27 +01:00
Douwe Maan
Yorick Peterse
Semyon Pupkov
Rémy Coutable
Jacob Schatz
Horacio Sanson
Grzegorz Bizon
Clement Ho
Drew Blessing
Z.J. van de Weg
Robert Schilling
Robert Speicher
Robert Speicher
Kamil Trzciński
James Lopez
Annabel Dunstone Gray
Sean McGivern
Sean McGivern
Adam Niedzielski
http://jneen.net/
Jacob Vosmaer
Markus Koller