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

	Commit message (Collapse)	Author	Age	Files	Lines
*	DRY up upload and download servicesapi-project-upload	Douwe Maan	2016-01-08	3	-24/+17
\|
*	Add API project upload endpoint	Douwe Maan	2016-01-07	3	-14/+14
\|
*	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Jacob Vosmaer	2016-01-07	14	-7/+254
\|
*	Merge branch 'remove-influxdb-credentials' into 'master'	Yorick Peterse	2016-01-07	2	-10/+0
\|\ \| \| \| \|	See merge request !2319
\| *	Remove InfluxDB username/passwordremove-influxdb-credentials	Yorick Peterse	2016-01-06	2	-10/+0
\| \| \| \| \| \| \| \| \| \|	InfluxDB over UDP doesn't use authentication, thus there's no need for these settings.
* \|	Merge branch 'more-opengraph' into 'master'	Robert Speicher	2016-01-06	6	-30/+22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add Open Graph data for group, project and commit. See merge request !2211
\| * \	Merge branch 'master' into more-opengraphmore-opengraph	Douwe Maan	2016-01-06	8	-51/+162
\| \|\ \
\| * \| \|	Don't override issue page description in project layout.	Douwe Maan	2016-01-06	4	-10/+7
\| \| \| \|
\| * \| \|	Remove now-redundant `page_description` call from Groups#show	Robert Speicher	2016-01-05	1	-2/+0
\| \| \| \|
\| * \| \|	Remove now-redundant `page_description` call from Projects#show	Robert Speicher	2016-01-05	1	-3/+1
\| \| \| \|
\| * \| \|	Make `page_description` less magical :sparkles:	Robert Speicher	2016-01-05	3	-17/+9
\| \| \| \|
\| * \| \|	Use `User#avatar_url` instead of `avatar_icon` helper	Robert Speicher	2016-01-05	1	-6/+4
\| \| \| \|
\| * \| \|	Merge branch 'master' into more-opengraph	Douwe Maan	2016-01-05	78	-369/+532
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/layouts/_head.html.haml
\| * \| \| \|	Add Open Graph data for group, project and commit.	Douwe Maan	2015-12-25	5	-6/+14
\| \| \| \| \|
* \| \| \| \|	Merge branch 'merge-when-build-succeeds-unchecked' into 'master'	Robert Speicher	2016-01-06	3	-7/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running The Merge when build succeeds service only merges when the MR is mergeable (open, not WIP, no conflicts). When the target branch is updated, all affected MRs have their merge status set to `unchecked`, and the conflicts check will only happen when `check_if_can_be_merged` is called, which happens when the MR page is viewed. When someone enables the automatic merge, the target branch is updated, no-one views the MR page again, and the build succeeds, the mergeability check will fail and the MR will not in fact be merged. This MR makes sure `check_if_can_be_merged` is always called when MR mergeability is checked. See merge request !2304
\| * \ \ \ \	Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-unchecked	Douwe Maan	2016-01-06	8	-51/+162
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Get "Merge when build succeeds" to work when commits were pushed to MR ↵	Douwe Maan	2016-01-05	3	-7/+13
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	target branch while builds were running
* \| \| \| \|	Merge branch 'fix-banzai-cache' into 'master'	Robert Speicher	2016-01-06	1	-2/+5
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mentionable reference extraction caching. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4130 Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2120 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2283 See merge request !2315
\| * \| \| \|	Fix mentionable reference extraction caching.	Douwe Maan	2016-01-06	1	-2/+5
\| \| \|/ / \| \|/\| \|
* \| \| \|	Enable Microsoft Azure OAuth2 support	Janis Meybohm	2016-01-06	2	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'fix/project-destroy-callbacks' into 'master'	Douwe Maan	2016-01-06	1	-4/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project destroy callback See gitlab-org/gitlab-ee!107. See merge request !2307
\| * \| \|	Fix project destroy callbackfix/project-destroy-callbacks	Grzegorz Bizon	2016-01-05	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See gitlab-org/gitlab-ee!107.
* \| \| \|	Fix the abuse report detail URL in the HTML email templaters-fix-abuse-report-url	Robert Speicher	2016-01-05	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'validate-readme-format' into 'master'	Robert Speicher	2016-01-05	1	-8/+6
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate README format Take the first previewable README file as project's README, otherwise if none file is available, or we can't preview any of them, we assume that project doesn't have a README file. Fixes #3978
\| * \| \|	Validate README format before displaying	Douglas Barbosa Alexandre	2016-01-05	1	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Take the first previewable README file as project’s README, otherwise if none file is available, or we can’t preview any of them, we assume that project doesn’t have a README file.
* \| \| \|	Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master'	Douwe Maan	2016-01-05	1	-42/+40
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better support for referencing and closing issues in asana_service.rb (by @mikew1) See merge request !2302
\| * \| \| \|	Don't log backtrace in Asana servicemikew1/gitlab-ce-better-asana-refs	Mike Wyatt	2016-01-04	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into better-asana-refs	Mike Wyatt	2015-12-31	182	-1116/+3740
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (307 commits) Update CHANGELOG spinach fix Updated allocations Gem to version 1.0.3 Removed various default metrics tags Update CHANGELOG Fix "I see current user as the first user" step Swap Author and Assignee Selectors on issuable index view Update CHANGELOG Make sure that is no pending migrations in Gitlab::CurrentSettings Added additional config environmental variables to help Debian packaging We don't use whenever anymore. Lets remove the schedule file Fix project transfer e-mail sending incorrect paths in e-mail notification Update CHANGELOG Use Gitlab::CurrentSettings for InfluxDB Write to InfluxDB directly via UDP Strip newlines from obfuscated SQL Add hotfix that allows to access build artifacts created before 8.3 note votes methids implementation When reCAPTCHA is disabled, allow registrations to go through without a code Downcased user or email search for avatar_icon. ...
\| * \| \| \| \|	Better handling of errors in Asana service	Mike Wyatt	2015-12-30	1	-9/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Update Asana service documentation	Mike Wyatt	2015-12-30	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Restore colon in Asana comment	Mike Wyatt	2015-12-30	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into better-asana-refs	Mike Wyatt	2015-12-30	7	-34/+35
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* origin/master: Use lazy reference extractor to get issue's MRs Banzai::XFilter -> Banzai::Filter::XFilter Move Markdown/reference logic from Gitlab::Markdown to Banzai
\| * \| \| \| \| \|	Fix error in Asana service	Mike Wyatt	2015-12-29	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update Asana service to work with Personal Access Token, lessen number of ↵	Mike Wyatt	2015-12-29	1	-31/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	requests to Asana API
\| * \| \| \| \| \|	Update Asana field descriptions	Mike Wyatt	2015-12-29	1	-4/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	better support for referencing and closing issues in asana_service.rb	Mike Wyatt	2015-12-16	1	-8/+20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master'	Douwe Maan	2016-01-05	5	-0/+115
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add graphs of commits ahead/behind default branch (by @brunsa2) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716 See merge request !2301
\| * \| \| \| \| \|	Fix diverging commit count calculationbrunsa2/gitlab-ce-diverging-branch-graphs	Jeff Stubler	2015-12-15	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rugged seemed to stop accepting branch names as valid refs, throwing `Rugged::ReferenceError` exceptions. Now the branch target rather than branch name is used, and the default branch's hash is also calculated, and these work properly. This used to work and might be something worth re-investigating in the future.
\| * \| \| \| \| \|	Merge branch 'master' into diverging-branch-graphs	Jeff Stubler	2015-12-03	319	-2369/+3452
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' into diverging-branch-graphs	Jeff Stubler	2015-11-12	163	-581/+1458
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Refactor for style issues	Jeff Stubler	2015-11-11	3	-21/+17
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into diverging-branch-graphs	Jeff Stubler	2015-11-02	2	-8/+8
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add graphs showing commits ahead and behind default to branches page	Jeff Stubler	2015-11-01	5	-2/+121
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master'	Douwe Maan	2016-01-05	2	-4/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show 'New Merge Request' buttons on canonical repo. (by @joshfng) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2189 to run tests on our runners. See merge request !2300
\| * \| \| \| \| \| \| \| \| \|	Change text back. Add additional tests.joshfng/gitlab-ce-fix-3802	Josh Frye	2016-01-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix tests	Josh Frye	2016-01-03	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Show 'New Merge Request' buttons on canonical repo.	Josh Frye	2016-01-03	2	-5/+7
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-abuse-reports-refactor' into 'master'	Douwe Maan	2016-01-05	3	-6/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Abuse Report refactors - Redirect back to user profile after report - "Tell, Don't Ask" for sending report notifications See merge request !2293
\| * \| \| \| \| \| \| \| \| \| \|	Add `AbuseReport#notify`rs-abuse-reports-refactor	Robert Speicher	2016-01-04	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tell, Don't Ask.
\| * \| \| \| \| \| \| \| \| \| \|	Make AbuseReportMailer responsible for knowing if it should deliver	Robert Speicher	2016-01-04	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \|