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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Show that user is already blocked on Abuse Reportsfix-block-button-still-showing-on-abuse-reports-after-user-is-blocked	Kelvin	2016-01-06	1	-0/+3
\|
*	Remove block button on abuse reports if user is already blocked	Kelvin	2016-01-06	1	-1/+1
\|
*	Merge branch 'rs-fix-abuse-report-url' into 'master'	Dmitriy Zaporozhets	2016-01-06	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix the abuse report detail URL in the HTML email template Previous URL resulted in a 404. See merge request !2310
\| *	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 'feature/detailed-user-endpoint' of ↵	Dmitriy Zaporozhets	2016-01-06	3	-1/+11
\|\ \ \| \| \| \| \| \| \| \| \|	https://gitlab.com/Michi302/gitlab-ce
\| * \|	Add missing changelog entryMichi302/gitlab-ce-feature/detailed-user-endpoint	Michi302	2016-01-05	1	-0/+1
\| \| \|
\| * \|	Make single user API endpoint return Entities::User instead of ↵	Michi302	2015-12-28	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \|	Entities::UserBasic
* \| \|	Merge pull request #9912 from pmq20/psvr/dec15	Stan Hu	2016-01-05	1	-0/+1
\|\ \ \ \| \|_\|/ \|/\| \|	Ignore config/sidekiq.yml
\| * \|	Ignore config/sidekiq.yml [ci skip]	The rugged tests are fragile	2015-12-15	1	-0/+1
\| \| \|
* \| \|	Merge branch 'validate-readme-format' into 'master'	Robert Speicher	2016-01-05	2	-8/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	[ci skip] Update CHANGELOGvalidate-readme-format	Douglas Barbosa Alexandre	2016-01-05	1	-0/+1
\| \| \| \|
\| * \| \|	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 'rs-version-check-svg' into 'master'	Robert Speicher	2016-01-05	2	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update version check images to use SVG See merge request !2244
\| * \| \| \|	Update version check images to use SVG	Robert Speicher	2016-01-05	2	-1/+2
\|/ / / /
* \| \| \|	Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master'	Douwe Maan	2016-01-05	2	-48/+111
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better support for referencing and closing issues in asana_service.rb (by @mikew1) See merge request !2302
\| * \| \| \|	Satisfy Rubocop	Douwe Maan	2016-01-05	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	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	403	-2136/+22333
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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. ...
\| * \| \| \| \|	Use `execute` in Asana specs	Mike Wyatt	2015-12-31	1	-15/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Actually test the posted comment in Asana service	Mike Wyatt	2015-12-31	1	-4/+21
\| \| \| \| \| \|
\| * \| \| \| \|	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	84	-495/+546
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 specs	Mike Wyatt	2015-12-29	1	-8/+32
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	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	2	-8/+41
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master'	Douwe Maan	2016-01-05	6	-0/+117
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	582	-4651/+9171
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into diverging-branch-graphs	Jeff Stubler	2015-11-12	297	-1025/+4533
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Refactor for style issues	Jeff Stubler	2015-11-11	3	-21/+17
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into diverging-branch-graphs	Jeff Stubler	2015-11-02	15	-112/+211
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Add graphs showing commits ahead and behind default to branches page	Jeff Stubler	2015-11-01	6	-2/+122
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master'	Douwe Maan	2016-01-05	5	-4/+38
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove feature tag from testing locally	Josh Frye	2016-01-03	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix tests	Josh Frye	2016-01-03	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Show 'New Merge Request' buttons on canonical repo.	Josh Frye	2016-01-03	5	-5/+29
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-abuse-reports-refactor' into 'master'	Douwe Maan	2016-01-05	6	-61/+101
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-58/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tell, Don't Ask.
\| * \| \| \| \| \| \| \| \| \| \| \|	Make AbuseReportMailer responsible for knowing if it should deliver	Robert Speicher	2016-01-04	2	-1/+47
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Redirect back to user profile page after abuse report	Robert Speicher	2016-01-04	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now the reporter will see the fruits of their labor, namely, the red icon!
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'pr-9938' into 'master'	Douwe Maan	2016-01-05	2	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification Hotfix note mail with notification See merge request !2288
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notificationpr-9938	Douwe Maan	2016-01-04	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hotfix note mail with notification
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-relative-links-to-root' into 'master'	Douwe Maan	2016-01-05	2	-1/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support a single directory traversal in RelativeLinkFilter Prior, if we were viewing a blob at `https://example.com/namespace/project/blob/master/doc/some-file.md` and it contained a relative link such as `[README](../README.md)`, the resulting link when viewing the blob would be: `https://example.com/namespace/project/blob/README.md` which omits the `master` ref, resulting in a 404. Fixes https://gitlab.com/gitlab-org/release-tools/issues/3 See merge request !2247
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Support a single directory traversal in RelativeLinkFilterrs-relative-links-to-root	Robert Speicher	2015-12-30	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, if we were viewing a blob at `https://example.com/namespace/project/blob/master/doc/some-file.md` and it contained a relative link such as `[README](../README.md)`, the resulting link when viewing the blob would be: `https://example.com/namespace/project/blob/README.md` which omits the `master` ref, resulting in a 404.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ssh-doc-fixes' into 'master'	Hannes Rosenögger	2016-01-05	1	-5/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Help "SSH" fixes A user was confused why ssh login did not work because he had used a nonstandard name during the key generation step. Maybe this will make it clearer. See merge request !2296