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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove InfluxDB username/passwordremove-influxdb-credentials	Yorick Peterse	2016-01-06	1	-2/+0
\| \| \| \| \|	InfluxDB over UDP doesn't use authentication, thus there's no need for these settings.
*	Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master'	Douwe Maan	2016-01-05	1	-0/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Merge branch 'master' into diverging-branch-graphs	Jeff Stubler	2015-12-03	33	-241/+366
\| \|\
\| * \	Merge branch 'master' into diverging-branch-graphs	Jeff Stubler	2015-11-12	14	-40/+166
\| \|\ \
\| * \| \|	Refactor for style issues	Jeff Stubler	2015-11-11	1	-2/+1
\| \| \| \|
\| * \| \|	Add graphs showing commits ahead and behind default to branches page	Jeff Stubler	2015-11-01	1	-0/+6
\| \| \| \|
* \| \| \|	Add `AbuseReport#notify`rs-abuse-reports-refactor	Robert Speicher	2016-01-04	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tell, Don't Ask.
* \| \| \|	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 'show-all-builds-by-default' into 'master'	Robert Speicher	2016-01-04	2	-6/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show all builds by default in the builds page Fixes #4240 See merge request !2243
\| * \| \| \|	Show 'All' tab by default in the builds pageshow-all-builds-by-default	Douglas Barbosa Alexandre	2016-01-04	2	-6/+6
\| \| \| \| \|
* \| \| \| \|	remove public field from namespace and refactoringnamespace-clean_up	Valery Sizov	2016-01-04	2	-2/+2
\|/ / / /
* \| \| \|	Write to InfluxDB directly via UDP	Yorick Peterse	2015-12-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes the need for Sidekiq and any overhead/problems introduced by TCP. There are a few things to take into account: 1. When writing data to InfluxDB you may still get an error if the server becomes unavailable during the write. Because of this we're catching all exceptions and just ignore them (for now). 2. Writing via UDP apparently requires the timestamp to be in nanoseconds. Without this data either isn't written properly. 3. Due to the restrictions on UDP buffer sizes we're writing metrics one by one, instead of writing all of them at once.
* \| \| \|	When reCAPTCHA is disabled, allow registrations to go through without a codefeature/recaptcha_settings	Stan Hu	2015-12-28	1	-1/+1
\| \| \| \|
* \| \| \|	reCAPTCHA is configurable through Admin Settings, no reload needed.	Gabriel Mazetto	2015-12-28	3	-1/+9
\| \| \| \|
* \| \| \|	Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settings	Yorick Peterse	2015-12-28	1	-0/+8
\| \| \| \|
* \| \| \|	Merge branch 'add-recaptcha-support' into 'master'	Dmitriy Zaporozhets	2015-12-28	2	-6/+30
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for Google reCAPTCHA in user registration to prevent spammers To do: - [x] Failing reCAPTCHA test causes all the fields to be lost - ~~[ ] Improve styling of reCAPTCHA box~~ (not possible) - ~~[ ] Put settings in `application_settings` (?)~~ ![image](/uploads/d38ca89820d3c0066fb8aeb645fd77f0/image.png) ![image](/uploads/6b050749963691b023d076682abcf736/image.png) Page when you fail CAPTCHA: ![image](/uploads/bc4846f0a5144985bc41dfa75eeab4c1/image.png) See merge request !2216
\| * \| \| \|	Fix failed spec	Stan Hu	2015-12-27	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add support for Google reCAPTCHA in user registration to prevent spammers	Stan Hu	2015-12-27	2	-6/+30
\| \| \| \| \|
* \| \| \| \|	Prevent an XSS warning from the updated Brakemanrs-bump-brakeman	Robert Speicher	2015-12-27	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'mention-all' into 'master'	Robert Speicher	2015-12-27	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only allow group/project members to mention `@all` Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3473 See merge request !2205
\| * \| \| \|	Merge branch 'master' into mention-all	Douwe Maan	2015-12-24	1	-1/+1
\| \|\ \ \ \
\| * \| \| \| \|	Only allow group/project members to mention `@all`	Douwe Maan	2015-12-24	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fixed codestyle and added 2FA documentationfeature/force-tfa	Gabriel Mazetto	2015-12-24	2	-3/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Add to application_settings forced TFA options	Gabriel Mazetto	2015-12-24	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	specs for forced two-factor authentication and grace period	Gabriel Mazetto	2015-12-24	2	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	simplified code and fixed stuffs
* \| \| \| \| \|	Grace period support for TFA	Gabriel Mazetto	2015-12-24	2	-3/+31
\| \| \| \| \| \|
* \| \| \| \| \|	WIP require two factor authentication	Gabriel Mazetto	2015-12-24	2	-0/+14
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'new-project-header-redesign' into 'master'	Dmitriy Zaporozhets	2015-12-24	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dropdowns for clone. Star and Fork with new count areas. Star and Unstarred Works now Fixes #2876 and #3482 Used existing styles. <br/> Did not attempt to make pixel perfect as styles already exist. <br/> ![Screen_Shot_2015-12-18_at_5.24.56_PM](/uploads/a79ba1e0be0232f2aeef8a43f3253479/Screen_Shot_2015-12-18_at_5.24.56_PM.png) See merge request !2156
\| * \| \| \|	adds starring and unstarring text to star button, also adds partial new styles	Jacob Schatz	2015-12-23	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'edit-on-fork' into 'master'	Dmitriy Zaporozhets	2015-12-24	6	-149/+171
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatically fork a project when not allowed to edit a file. Fixes #3215. To do: - [ ] Add tests ----- ## "Edit" button on file in a project the user does NOT have write access to ![edit_file](/uploads/7602157420768aef483a6586bba2d164/edit_file.png) ## Clicking will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the edit page on the original project with a notice ![edit_notice](/uploads/94ed1319404370ff1e9c0d672fb41e03/edit_notice.png) ## The user cannot change the target branch and is informed that editing will start an MR ![edit_footer](/uploads/4da68d4795c7177e575b7c434d16eeae/edit_footer.png) ## Hitting "Commit changes" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.38.08](/uploads/d777a4db6f38a5a1be84031694465bc1/Screen_Shot_2015-12-17_at_23.38.08.png) ----- ## "Create file, "Upload file" and "New directory" buttons in a project the user does NOT have write access to ![new_directory](/uploads/72f556248f30d6652523bbb4be01b3e0/new_directory.png) ## Clicking any of these options will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the tree page on the original project with a notice ![new_directory_notice](/uploads/a1a3e11308ae0e8f0913fae6813a37ed/new_directory_notice.png) ## Clicking "New directory" again will show the modal. The user cannot change the target branch and is informed that editing will start an MR ![new_dir](/uploads/99ca8cbfb2f70603e352b3fdf67b6281/new_dir.png) ## Hitting "Create directory" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.39.19](/uploads/3713d0235abf831361b803a6198c5bc1/Screen_Shot_2015-12-17_at_23.39.19.png) cc @dzaporozhets @skyruler See merge request !2145
\| * \| \| \|	Add tests for new functionality	Douwe Maan	2015-12-21	1	-1/+5
\| \| \| \| \|
\| * \| \| \|	Fix specs and behavior for LFS files	Douwe Maan	2015-12-18	3	-7/+15
\| \| \| \| \|
\| * \| \| \|	Automatically fork a project when not allowed to edit a file.	Douwe Maan	2015-12-18	6	-148/+158
\| \| \| \| \|
* \| \| \| \|	Merge branch 'improve_emoji_picker' into 'master'	Dmitriy Zaporozhets	2015-12-23	1	-1/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve emoji picker This request uses an emoji image sprite to show big set of emojis. The sprite has been made based one gemojione gem images. The categories are retrieved from https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json as well. Some categories are pretty poor, it can be extended in the future. It's a first step on the way to improve picker. The first implementation was using https://github.com/iamcal/emoji-data project, but there was huge incompatibility with gemojione emojis set and I had to drop that solution. ![Screenshot_2015-12-22_23.26.27](/uploads/7d323eb0586204ac92915b41233b97ec/Screenshot_2015-12-22_23.26.27.png) See merge request !2172
\| * \| \| \| \|	base implementation of emoji picker [ci skip]	Valery Sizov	2015-12-22	1	-1/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Make CI Lint form synchronousfix/ci-lint	Grzegorz Bizon	2015-12-22	1	-1/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes `remote: true` from CI Lint form, making it synchronous form. This also removes some complexity related to displaying lint messages. View also has been updated, removed deprecated Bootstrap 2 tags. Improved design. Closes #4206
* \| \| \| \|	Merge branch 'admin_add_identity' into 'master'	Robert Speicher	2015-12-21	1	-1/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow admin to create new user identities Fixes #2442 See merge request !2077
\| * \| \| \| \|	Allow admin to create new user identities	Drew Blessing	2015-12-15	1	-1/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'tduehr/gitlab-ce-cas-support'	Douwe Maan	2015-12-21	2	-1/+30
\|\ \ \ \ \ \
\| * \| \| \| \| \|	add CAS authentication support	tduehr	2015-12-14	2	-1/+30
\| \|/ / / / /
* \| \| \| \| \|	Backport JIRA service	Drew Blessing	2015-12-18	1	-2/+3
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'fix-merge-immediately' into 'master'	Robert Speicher	2015-12-16	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 'Merge Immediately' button Fixes #4125 See merge request !2117
\| * \| \| \| \|	Fix 'Merge Immediately' buttonfix-merge-immediately	Douwe Maan	2015-12-16	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-endpoint-not-setting-var' into 'master'	Douwe Maan	2015-12-16	1	-6/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix endpoint not setting needed @ci_commit /cc @DouweM See merge request !2112
\| * \| \| \| \|	Fix endpoint not setting needed @ci_commit	Zeger-Jan van de Weg	2015-12-16	1	-6/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge remote-tracking branch 'origin/feature/update-rubocop'	Dmitriy Zaporozhets	2015-12-16	3	-3/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fixed Rubocop offenses	Gabriel Mazetto	2015-12-15	3	-3/+4
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-issue-4032' into 'master'	Douwe Maan	2015-12-15	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix note polling Closes #4032 See merge request !2084
\| * \| \| \| \|	Fix note pollingrs-issue-4032	Robert Speicher	2015-12-12	1	-1/+2
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #4032
* \| \| \| \|	Use a new admin runners path when reseting runners token	Grzegorz Bizon	2015-12-14	1	-1/+1
\| \| \| \| \|