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

	Commit message (Collapse)	Author	Age	Files	Lines
*	More create_listauto-fsck	Jacob Vosmaer	2016-04-14	1	-1/+1
\|
*	Documentation / help improvements	Jacob Vosmaer	2016-04-14	3	-5/+7
\|
*	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck	Jacob Vosmaer	2016-04-13	124	-491/+4249
\|\
\| *	Merge branch 'push-ref' into 'master'	Kamil Trzciński	2016-04-13	3	-5/+41
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix high CPU usage when PostReceive receives refs/merge-requests/<id> Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12661 See merge request !3651
\| \| *	Merge branch 'master' into push-ref	Kamil Trzcinski	2016-04-13	193	-839/+5058
\| \| \|\
\| \| * \|	Fix high CPU usage when PostReceive receives refs/merge-requests/<id>push-ref	Kamil Trzcinski	2016-04-11	3	-5/+41
\| \| \| \|
\| * \| \|	Merge branch 'api-star-project' into 'master'	Rémy Coutable	2016-04-13	6	-0/+214
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Star and unstar a project Add two new endpoints `POST /projects/:id/star` and `POST /projects/:id/unstar` to star and unstar a project. * Closes #12739 See merge request !3578
\| \| * \| \|	Styling changes to code and docs	Robert Schilling	2016-04-13	4	-9/+8
\| \| \| \| \|
\| \| * \| \|	Make staring API more restful	Robert Schilling	2016-04-13	3	-16/+15
\| \| \| \| \|
\| \| * \| \|	API: Star and unstar a project	Robert Schilling	2016-04-13	6	-0/+216
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fix-bug-causing-comment-to-submit-twice' into 'master'	Jacob Schatz	2016-04-13	1	-1/+5
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug causing comment form in issue to submit twice when CTRL+Enter is pressed twice See merge request !3655
\| \| * \| \| \|	fix bug causing comment form in issue to submit twice when CTRL+Enter is ↵fix-bug-causing-comment-to-submit-twice	Arinde Eniola	2016-04-11	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pressed twice
\| * \| \| \| \|	Merge branch 'carousel-remove' into 'master'	Robert Speicher	2016-04-13	2	-2/+11
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Bootstrap Carousel The Bootstrap carousel module is used for image carousels, and we don't use it anywhere on the site. Fixes #14670. See merge request !3624
\| \| * \| \| \| \|	Remove Bootstrap Carousel	connorshea	2016-04-12	2	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Bootstrap carousel module is used for image carousels, and we don't use it anywhere on the site. Also separated the Bootstrap JavaScript into separate components and removed the carousel component. Fixes #14670.
\| * \| \| \| \| \|	Merge branch 'instrument-house-keeping' into 'master'	Rémy Coutable	2016-04-13	2	-4/+11
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument the HousekeepingService class I'm starting with instrumenting this class as mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/15094#note_4796278. See merge request !3701
\| \| * \| \| \| \| \|	Instrument the HousekeepingService classinstrument-house-keeping	Yorick Peterse	2016-04-13	2	-4/+11
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to track how much time is spent in updating the "pushes_since_gc" column as well as the time needed to obtain the lease.
\| * \| \| \| \| \|	Merge branch 'fix_grafana_docs' into 'master'	Achilleas Pipinellis	2016-04-13	4	-3/+6
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Grafana docs and link from Influx page Fixing images and adding links to Influx docs, as suggested by @sytses See merge request !3702
\| \| * \| \| \| \|	Fix Grafana docs and link from Influx page	Drew Blessing	2016-04-12	4	-3/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'label-filter' into 'master'	Jacob Schatz	2016-04-13	3	-2/+33
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed not being able to filter by any or no labels Brings back the options to filter by any or no label Closes #15008 ![Screen_Shot_2016-04-07_at_11.26.41](/uploads/20d949b19f537d830118532e1d44feb7/Screen_Shot_2016-04-07_at_11.26.41.png) See merge request !3589
\| \| * \| \| \| \| \|	Filtering by any label keeps the text on the toggle buttonlabel-filter	Phil Hughes	2016-04-12	2	-1/+10
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added label filter tests	Phil Hughes	2016-04-07	1	-0/+22
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fixed issue with any label & no label filters missing	Phil Hughes	2016-04-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15008
\| * \| \| \| \| \| \|	Merge branch 'external-omniauth-providers' into 'master'	Marin Jankovski	2016-04-13	6	-9/+70
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow Omniauth providers to be marked as external Related to #4009 With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login. MR for Omnibus: gitlab-org/omnibus-gitlab!727 /cc @dblessing @DouweM See merge request !3657
\| \| * \| \| \| \| \| \|	Better control flow.external-omniauth-providers	Patricio Cano	2016-04-11	1	-6/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Added CHANGELOG item	Patricio Cano	2016-04-11	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Documentation of feature	Patricio Cano	2016-04-11	2	-0/+30
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Added default setting for `external_providers`	Patricio Cano	2016-04-11	1	-9/+28
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Allow `external_providers` for Omniauth to be defined to mark these users as ↵	Patricio Cano	2016-04-11	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	external
\| * \| \| \| \| \| \| \|	Merge branch 'rs-archive-cache-worker-cron' into 'master'	Dmitriy Zaporozhets	2016-04-13	4	-2/+6
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663
\| \| * \| \| \| \| \| \| \|	Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cron	Robert Speicher	2016-04-12	4	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15105
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-04-13	118	-481/+4246
\| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch 'rs-gitlab-com-check' into 'master'	Dmitriy Zaporozhets	2016-04-13	2	-0/+20
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `Gitlab.com?` method To be used as a feature flag for GitLab.com-only features, such as welcome emails. We will be careful to only use this to disable features or functionality that do not make sense for any installations that aren't GitLab.com. We will not use this to restrict features from other installations or keep them "exclusive" to GitLab.com. See merge request !3682
\| \| \| * \| \| \| \| \| \| \| \|	Add `Gitlab.com?` methodrs-gitlab-com-check	Robert Speicher	2016-04-12	2	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To be used as a feature flag for GitLab.com-only features, such as welcome emails. We will be careful to only use this to disable features or functionality that do not make sense for any installations that aren't GitLab.com. We will not use this to restrict features from other installations or keep them "exclusive" to GitLab.com.
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'api-group-leaking' into 'master'	Rémy Coutable	2016-04-13	4	-14/+21
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Return 404 if user does not have access to group Closes #15185 After !3587 is merged, I'll update this one to also fix the return code of the tests in !3587. See merge request !3683
\| \| \| * \| \| \| \| \| \| \| \|	Fix group_member_spec to not leak information	Robert Schilling	2016-04-13	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	API: Avoid group leak while updating the group	Robert Schilling	2016-04-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	API: Return 404 if user does not have access to group	Robert Schilling	2016-04-13	3	-7/+12
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'api-move-issues' into 'master'	Rémy Coutable	2016-04-13	4	-1/+148
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Ability to move an issue Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14741 See merge request !3593
\| \| \| * \| \| \| \| \| \| \| \| \|	Fix doc for moving an issue	Robert Schilling	2016-04-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Update tests for moving issues via API	Robert Schilling	2016-04-13	4	-30/+51
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	API: Ability to move an issue	Robert Schilling	2016-04-13	4	-1/+127
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'patch-2' into 'master'	Robert Schilling	2016-04-13	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	improve formatting See merge request !3688
\| \| \| * \| \| \| \| \| \| \| \| \| \|	improve formatting	Ben Bodenmiller	2016-04-12	1	-1/+1
\| \| \| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'custom-transaction-tags' into 'master'	Rémy Coutable	2016-04-13	3	-0/+36
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added ability to add custom tags to transactions cc @pcarranza See merge request !3674
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Added ability to add custom tags to transactions	Yorick Peterse	2016-04-13	3	-0/+36
\| \| \| \| \|/ / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	One use case for this is manually setting the "action" tag for Grape API calls. Due to Grape running blocks there are no human readable method names that can be used for the "action" tag, thus we have to set these manually on a case by case basis.
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'configure_trusted_proxies' into 'master'	Rémy Coutable	2016-04-13	5	-0/+24
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust the default trusted_proxies to only include localhost And also allow other trusted proxies to be added from the config.yml. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538 Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208 See merge request !3524
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Updated trusted proxies doc section to link to the restart GitLab docsconfigure_trusted_proxies	DJ Mountney	2016-04-12	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Add changelog entries, install docs, and gitlab.yml.example entry for the ↵	DJ Mountney	2016-04-12	3	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	trusted_proxies setting
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Adjust the default trusted_proxies to only include localhost, and allow ↵	DJ Mountney	2016-04-12	2	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	other trusted proxies to be configured.
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jira_docs' into 'master'	Achilleas Pipinellis	2016-04-13	2	-5/+17
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tie example config to JIRA screenshot Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203 See merge request !3693