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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hotfix note mail with notification
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'new-markdown' into 'master'	Dmitriy Zaporozhets	2016-01-05	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	markdown fixes old ![Screenshot_2016-01-05_10.49.46](/uploads/731f0e83ceefa74650ea27f8dca67b35/Screenshot_2016-01-05_10.49.46.png) new ![Screenshot_2016-01-05_10.51.51](/uploads/85a82b2a589f9a4ad3dd47c6de3b89d7/Screenshot_2016-01-05_10.51.51.png) See merge request !2295
\| * \| \| \| \| \| \| \| \| \| \|	markdown fixesnew-markdown	Andriy Dyadyura	2016-01-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	markdown fixes	Andriy Dyadyura	2016-01-05	1	-3/+3
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'improved-leave-project' into 'master'	Dmitriy Zaporozhets	2016-01-05	3	-16/+25
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds settings menu to the top for editting and leaving projects @creamzy @skyruler @dzaporozhets Menu contents depends on user's rights. Fixes #4221 ![Screen_Shot_2015-12-23_at_10.02.47_PM](/uploads/daeaef937bf9d9f4db7ccb674e344ac1/Screen_Shot_2015-12-23_at_10.02.47_PM.png) ![Screen_Shot_2015-12-23_at_10.02.41_PM](/uploads/58eb4eea7d640f01d7f05c2a408a2c04/Screen_Shot_2015-12-23_at_10.02.41_PM.png) ![Screen_Shot_2015-12-23_at_10.02.55_PM](/uploads/4b2ae027a13efcbad3eb81b04f134c4f/Screen_Shot_2015-12-23_at_10.02.55_PM.png) ![Screen_Shot_2015-12-23_at_10.04.47_PM](/uploads/bd5d9d8ddd72d16d74c32c6c1f569776/Screen_Shot_2015-12-23_at_10.04.47_PM.png) See merge request !2195
\| * \| \| \| \| \| \| \| \| \| \|	removes footer message about access to project	Jacob Schatz	2016-01-04	1	-8/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into improved-leave-project	Jacob Schatz	2015-12-28	2	-0/+61
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	fixes tests failing	Jacob Schatz	2015-12-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	adds settings menu to the top for editting and leaving projects	Jacob Schatz	2015-12-28	3	-9/+25
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-logo-animation' into 'master'	Dmitriy Zaporozhets	2016-01-05	3	-8/+51
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the logo as a loading indicator ![logo-sweep](/uploads/ff048fd2e56a6dcae8801f998b484623/logo-sweep.gif) See merge request !2277
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Restructure logo JS to use `setInterval`rs-logo-animation	Robert Speicher	2016-01-04	1	-25/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Decrease the logo sweep delay	Robert Speicher	2016-01-04	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Correct the logo ID names	Robert Speicher	2016-01-04	2	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Her left, not ours!
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Ensure the sweep always starts from the left	Robert Speicher	2016-01-02	1	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Use the logo as a loading indicator	Robert Speicher	2016-01-02	2	-1/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #5616
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Give the logo shapes meaningful IDs	Robert Speicher	2016-01-02	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dedupe-notifications-watcher-and-subscriber' into 'master'	Dmitriy Zaporozhets	2016-01-05	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't notify users twice if they are both project watchers and subscribers Closes #4708 See merge request !2290
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't notify users twice if they are both project watchers and subscribers	Stan Hu	2016-01-04	1	-0/+1
\| \| \|_\|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #4708
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-remove-jquery-blockui' into 'master'	Dmitriy Zaporozhets	2016-01-05	2	-8/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove jquery.blockUI.js plugin It was only used to block the issue (but not merge request) list when the sort was changed. See merge request !2287
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove jquery.blockUI.js pluginrs-remove-jquery-blockui	Robert Speicher	2016-01-04	2	-8/+0
\| \| \|_\|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was only used to block the issue (but not merge request) list when the sort was changed.