delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \|	Allow a project member to leave the projected through the APIremove-myself-from-project-api-7687	Zeger-Jan van de Weg	2016-04-12	1	-4/+9
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'api-fix-milestone-iid-filter' into 'master'	Rémy Coutable	2016-04-12	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Add iid filter to milestones This was documented in the API docs but it was never working because the iid filter was never applied to the milestones. The tests were working by accident because the were checking the first element, which was by accident the request element. * Closes https://github.com/gitlabhq/gitlabhq/issues/10122 See merge request !3588
\| * \| \| \| \| \| \| \|	API: Add iid filter to milestones	Robert Schilling	2016-04-12	1	-0/+2
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	API: Expose updated_at for notes	Robert Schilling	2016-04-12	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'api-labels-info' into 'master'	Rémy Coutable	2016-04-12	1	-0/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Expose open_issues_count, closed_issues_count, open_merge_requests_count on labels Partly fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13238 See merge request !3569
\| * \| \| \| \| \|	API: Expose open_issues_count, closed_issues_count, ↵	Robert Schilling	2016-04-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	open_merge_requests_count on labels
* \| \| \| \| \| \|	Instrument Banzai code	Yorick Peterse	2016-04-11	1	-8/+12
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	Fixed stubbing for Gitlab::Metrics specs	Yorick Peterse	2016-04-11	1	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the measure method uses Transaction.current directly the SQL subscriber (Subscribers::ActiveRecord) will add timings of queries triggered by DB cleaner.
* \| \| \| \| \|	Track call counts in Gitlab::Metrics.measure_blockmetrics-measure-block-transaction	Yorick Peterse	2016-04-11	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Store block timings as transaction values	Yorick Peterse	2016-04-11	2	-9/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it easier to query, simplifies the code, and makes it possible to figure out what transaction the data belongs to (simply because it's now stored _in_ the transaction). This new setup keeps track of both the real/wall time _and_ CPU time spent in a block, both measured using milliseconds (to keep all units the same).
* \| \| \| \| \|	Merge branch 'redis-connection-pool' into 'master'	Robert Speicher	2016-04-08	4	-43/+64
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redis connection pool Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 Having an easily accessible Redis connection pool allows us to do more cool stuff with Redis in GitLab (instead of having to go through e.g. the Rails cache). See merge request !3521
\| * \| \| \| \| \|	Put CACHE_NAMESPACE in the Gitlab::Redis module	Jacob Vosmaer	2016-04-07	2	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Be careful when setting class instance vars	Jacob Vosmaer	2016-04-04	1	-2/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add Gitlab::Redis connection pool	Jacob Vosmaer	2016-04-04	3	-16/+24
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'instrument-rails-cache' into 'master'	Yorick Peterse	2016-04-08	1	-0/+39
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument Rails cache code See merge request !3619
\| * \| \| \| \| \|	Instrument Rails cache codeinstrument-rails-cache	Yorick Peterse	2016-04-08	1	-0/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to track how much time of a transaction is spent in dealing with cached data.
* \| \| \| \| \| \|	Merge branch 'metrics-timestamp-precision' into 'master'	Yorick Peterse	2016-04-08	1	-1/+21
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use more accurate timestamps for InfluxDB. See merge request !3617
\| * \| \| \| \| \|	Use more accurate timestamps for InfluxDB.metrics-timestamp-precision	Yorick Peterse	2016-04-08	1	-1/+21
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes the timestamp of metrics to be more accurate/unique by using Time#to_f combined with a small random jitter value. This combination hopefully reduces the amount of collisions, though there's no way to fully prevent any from occurring. Fixes gitlab-com/operations#175
* \| \| \| \| \|	API: Expose subscribed? on issues	Robert Schilling	2016-04-08	4	-13/+21
\|/ / / / /
* \| \| \| \|	Merge branch 'api-filter-milestone' into 'master'	Rémy Coutable	2016-04-07	1	-2/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Ability to filter milestones by state Ability to filter milestones by `active` and `closed` state. * Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14931 See merge request !3566
\| * \| \| \| \|	Improve coding and doc style	Robert Schilling	2016-04-06	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	API: Ability to filter milestones by state	Robert Schilling	2016-04-06	1	-2/+18
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'feature/expose-builds-badge' into 'master'	Rémy Coutable	2016-04-07	1	-4/+26
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose badges This MR exposes badge somewhere in visible place. ![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png) Closes #13801 See merge request !3326
\| * \| \| \| \| \|	Extend build status badge, add html/markdown methods	Grzegorz Bizon	2016-04-06	1	-4/+26
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Robert Schilling	2016-04-07	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Changed the argument of not_found for 'unprotect'	Yasser Hussain	2016-04-06	1	-1/+1
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not_found appends string "Not Found" to the argument causing the resulting message to be "Branch does not exist Not Found" which is an incorrect error message. Changed the argument of not_found! for 'unprotect' command to "Branch" from "Branch does not exist". This makes the final error message to appear as "Branch Not Found" which is correct and same as error messages for other commands like 'protect'.
* \| \| \| \| \|	Merge branch 'saml-external-groups' into 'master'	Robert Speicher	2016-04-07	3	-2/+64
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow SAML to identify external users and set them as such Related to #4009 Fixes #14577 This allows SAML to retrieve group information form the `SAML Response` and match that to a setting that will flag all matching users as external. See merge request !3530
\| * \| \| \| \| \|	Implemented suggested fixes	Patricio Cano	2016-04-06	3	-6/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added CHANGELOG itemsaml-external-groups	Patricio Cano	2016-04-06	1	-1/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix error that was causing only one group to be returned and corrected specs ↵	Patricio Cano	2016-04-06	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to use the proper attribute type
\| * \| \| \| \| \|	Changed config syntax and improved how chaanges in group memberships are ↵	Patricio Cano	2016-04-05	2	-29/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	handled when external groups is set up
\| * \| \| \| \| \|	Prepare SAML for group retrieval	Patricio Cano	2016-04-04	3	-2/+80
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'patch/fix-markdown-preview-wikis' into 'master'	Robert Speicher	2016-04-07	3	-6/+70
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wiki preview URL converting problem [via Markdown] Current implementation when rendering the preview, thinks relative links are for project repository files. We are creating a new preview route that will define correct context data to render for wikis instead. Fixes #2380, #1184 See merge request !3461
\| * \| \| \| \| \|	little refactor and improvements on specs	Gabriel Mazetto	2016-04-06	1	-6/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Ensure correct filter order to validate with our markdown specpatch/fix-markdown-preview-wikis	Gabriel Mazetto	2016-04-06	2	-3/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix a few edited references from WikiLinkFilter and specs	Gabriel Mazetto	2016-04-06	1	-2/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed WikiPipeline and specs	Gabriel Mazetto	2016-04-06	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added WikiLinkFilter	Gabriel Mazetto	2016-04-01	2	-2/+56
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed Gollum pages link url expansion to render correctly in preview	Gabriel Mazetto	2016-03-30	1	-3/+9
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'patch/fix-ldap-unblock-user-logic' into 'master'	Robert Speicher	2016-04-06	1	-1/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unblocks user when active_directory is disabled and it can be found We implemented a specific block state to handle user blocking that originates from LDAP filtering rules / directory state in !2242. That introduced a regression in LDAP authentication when Active Directory support was disabled. You could have a scenario where the user would not be temporarily found (like a filtering rule), that would mark the user as `ldap_blocked`, but will never unblock it automatically when that state changed. Fixes #14253, #13179, #13259, #13959 See merge request !3550
\| * \| \| \| \| \|	Unblocks user when active_directory is disabled and it can be foundpatch/fix-ldap-unblock-user-logic	Gabriel Mazetto	2016-04-05	1	-1/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'fix-markdown-rendering' into 'master'	Douwe Maan	2016-04-06	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix header link rendering when containing numbers This fixes the problem where Markdown such as: ### 31st Would get rendered as a link tag pointing to issue number 31 inside a header tag. See gitlab-org/gitlab-ce#14936 for more information. cc @rspeicher See merge request !3568
\| * \| \| \| \| \|	Fix header link rendering when containing numbersfix-markdown-rendering	Yorick Peterse	2016-04-06	1	-1/+1
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes the problem where Markdown such as: ### 31st Would get rendered as a link tag pointing to issue number 31 inside a header tag. See gitlab-org/gitlab-ce#14936 for more information.
* \| \| \| \| \|	Revert "API: Ability to retrieve a single tag"	Robert Schilling	2016-04-06	1	-14/+0
\| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7f287c9136d5d1cdda8df170c6e772ca82aad1e9.
* \| \| \| \|	Merge branch 'metrics-measure-block' into 'master'	Robert Speicher	2016-04-06	1	-0/+26
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support for measuring Ruby blocks using GitLab performance monitoring This adds support for measuring timings of arbitrary Ruby blocks. Fixes #14710 See merge request !3515
\| * \| \| \| \|	Measure Ruby blocks using Gitlab::Metrics	Yorick Peterse	2016-04-06	1	-0/+26
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows measuring of timings of arbitrary Ruby blocks, this allows for more fine grained performance monitoring. Custom values and tags can also be attached to a block.
* \| \| \| \|	Expose user location in API	Robert Schilling	2016-04-06	2	-3/+5
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	API: Ability to retrieve a single tag	Robert Schilling	2016-04-06	1	-0/+14
\|/ / /
* \| \|	Wrap images in discussions and wikis with a link to the image source using ↵	connorshea	2016-04-04	2	-0/+28
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	ImageLinkFilter. Resolves #14411. See merge request !3464
* \|	Cleaned up caching in AbstractReferenceFilter	Yorick Peterse	2016-04-04	1	-15/+11
\| \| \| \| \| \| \| \| \| \|	Cleaning this up any further is a bit tricky as the caches in question should only be evaluated if RequestStore is actually enabled.