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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Updated allocations Gem to version 1.0.3update-allocations-gem	Yorick Peterse	2015-12-31	1	-1/+1
\|
*	Merge branch 'zj/gitlab-ce-swap-position-author-assignee-selector-issueable' ↵	Robert Speicher	2015-12-30	3	-9/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Swap Author and Assignee Selectors on issuable index view Closes #4039 See merge request !2256
\| *	Update CHANGELOG	Robert Speicher	2015-12-30	1	-1/+0
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Fix "I see current user as the first user" step	Robert Speicher	2015-12-30	1	-5/+4
\| \| \| \| \| \| \| \|	Why did this break? `¯\_(ツ)_/¯`
\| *	Swap Author and Assignee Selectors on issuable index view	Zeger-Jan van de Weg	2015-12-30	2	-4/+6
\|/ \| \| \|	Closes #4039
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Robert Speicher	2015-12-30	1	-8/+0
\|\
\| *	Merge branch 'remove-whenever-schedule' into 'master'	Robert Speicher	2015-12-30	1	-8/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused config/schedule.rb file [ci skip] See merge request !2249
\| \| *	We don't use whenever anymore. Lets remove the schedule file	Jeroen van Baarsen	2015-12-30	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why is this needed? Not really needed, but having code that is not used around is confusing, so lets remove it Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* \| \|	Update CHANGELOG	Robert Speicher	2015-12-30	1	-1/+1
\|/ / \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'fix-build' into 'master'	Robert Speicher	2015-12-30	1	-1/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure that is no pending migrations when using database on Gitlab::CurrentSettings This fixes the undefined method `recaptcha_enabled' for #<ApplicationSetting:0x007f28552f8238> when running the build. See merge request !2254
\| * \|	Make sure that is no pending migrations in Gitlab::CurrentSettingsfix-build	Douglas Barbosa Alexandre	2015-12-30	1	-1/+3
\| \|/
* \|	Merge branch 'feature/env_variables_for_emails' into 'master' jenkins-integration-fix	Sytse Sijbrandij	2015-12-30	3	-6/+9
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added additional config environmental variables to help Debian packaging * GITLAB_EMAIL_FROM * GITLAB_EMAIL_DISPLAY_NAME * GITLAB_EMAIL_REPLY_TO This is a followup on https://gitlab.com/gitlab-org/gitlab-ce/issues/3717 See merge request !2251
\| *	Added additional config environmental variables to help Debian packaging	Gabriel Mazetto	2015-12-30	3	-6/+9
\|/ \| \| \| \|	* GITLAB_EMAIL_FROM * GITLAB_EMAIL_DISPLAY_NAME * GITLAB_EMAIL_REPLY_TO
*	Merge branch 'fix/missing-ci-build-traces' into 'master'	Grzegorz Bizon	2015-12-30	2	-9/+57
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Hotfix for builds trace data integrity Closes #4246 See merge request !2224
\| *	Add hotfix that allows to access build artifacts created before 8.3fix/missing-ci-build-traces	Grzegorz Bizon	2015-12-29	2	-9/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a temporary hotfix that allows to access build artifacts created before 8.3. See #5257. This needs to be changed after migrating CI build files. Note that `ArtifactUploader` uses `artifacts_path` to create a storage directory before and after parsisting `Ci::Build` instance, before and after moving a file to store (save and fetch a file).
\| *	Hotfix for builds trace data integrity	Grzegorz Bizon	2015-12-28	1	-1/+22
\| \| \| \| \| \| \| \|	Issue #4246
* \|	Merge branch 'fix-user-autocomplete' into 'master'	Robert Speicher	2015-12-30	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes problem with user autocomplete URI ``` Failed to load resource: net::ERR_NAME_NOT_RESOLVED http://autocomplete/users.json?search=&per_page=20&active=true&current_user=false ``` Fixes #4118, #4136 See merge request !2136
\| * \|	Fix user autocomplete uri	Igor Matsko	2015-12-26	1	-1/+1
\| \| \|
* \| \|	Merge branch 'fix-transfer-project-email' into 'master'	Robert Speicher	2015-12-29	2	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project transfer e-mail sending incorrect paths in e-mail notification The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race condition where the mailer would be invoked before the project was committed to the database, causing the transfer e-mail notification to show the old path instead of the new one. Closes #4670 See merge request !2235
\| * \| \|	Fix project transfer e-mail sending incorrect paths in e-mail notification	Stan Hu	2015-12-29	2	-1/+6
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race condition where the mailer would be invoked before the project was committed to the database, causing the transfer e-mail notification to show the old path instead of the new one. Closes #4670
* \| \|	Update CHANGELOG	Robert Speicher	2015-12-29	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'upvote_count_to_api' into 'master'	Valery Sizov	2015-12-29	6	-23/+24
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert upvotes and downvotes params back to MR API issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 See merge request !2212
\| * \| \|	note votes methids implementationupvote_count_to_api	Valery Sizov	2015-12-29	1	-2/+2
\| \| \| \|
\| * \| \|	Revert upvotes and downvotes params to MR API	Valery Sizov	2015-12-28	6	-21/+22
\| \| \| \|
* \| \| \|	Merge branch 'influxdb-current-settings' into 'master'	Yorick Peterse	2015-12-29	1	-25/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	See merge request !2239
\| * \| \| \|	Use Gitlab::CurrentSettings for InfluxDB	Yorick Peterse	2015-12-29	1	-25/+11
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures we can still start up even when not connecting to a database.
* \| \| \|	Merge branch 'influxdb-without-sidekiq' into 'master'	Yorick Peterse	2015-12-29	19	-155/+155
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	See merge request !2238
\| * \| \| \|	Write to InfluxDB directly via UDP	Yorick Peterse	2015-12-29	18	-155/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \|	Strip newlines from obfuscated SQL	Yorick Peterse	2015-12-29	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Newlines aren't really needed and they may mess with InfluxDB's line protocol.
* \| \| \| \|	Merge branch 'issue_3780' into 'master'	Dmitriy Zaporozhets	2015-12-29	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Downcased user or email search for avatar_icon. GitLab users are defined with their mail address which is enforced to be lower case. When a commit is listed in the history whose committer mail address is not written in all lower case, the corresponding GitLab user won't be found because the search is case sensitive resp. the mail address to search for not downcased. Closes #3780 See merge request !2234
\| * \| \| \|	Downcased user or email search for avatar_icon.issue_3780	Stefan Kahlhöfer	2015-12-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rubén Dávila <rdavila84@gmail.com>
* \| \| \| \|	Merge branch 'feature/recaptcha_settings' into 'master'	Dmitriy Zaporozhets	2015-12-29	13	-71/+84
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Makes reCAPTCHA configurable through Application Settings screen Following the work made by @stanhu here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2216, made it configurable without needing to restart Gitlab See merge request !2231
\| * \| \| \| \|	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	13	-71/+84
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-spelling-mistake' into 'master'	Robert Speicher	2015-12-29	2	-4/+4
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spelling mistake, thanks Connor. [ci skip] See merge request !2227
\| * \| \| \| \|	Fix spelling mistake, thanks Connor.fix-spelling-mistake	Sytse Sijbrandij	2015-12-28	2	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'influxdb-missing-settings' into 'master'	Yorick Peterse	2015-12-28	2	-7/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle missing settings table for metrics See merge request !2232
\| * \| \| \| \| \|	Handle missing settings table for metrics	Yorick Peterse	2015-12-28	2	-7/+11
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures we can still boot, even when the "application_settings" table doesn't exist.
* \| \| \| \| \|	Merge branch 'fix_link_permissions' into 'master'	Achilleas Pipinellis	2015-12-28	1	-3/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in permissions page See merge request !2233
\| * \| \| \| \|	Fix broken link in permissions page [ci skip]	Achilleas Pipinellis	2015-12-28	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'relocate-influxdb-settings' into 'master'	Yorick Peterse	2015-12-28	7	-33/+122
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move InfluxDB settings to ApplicationSetting This moves the settings from the YAML files to the database. cc @sytses See merge request !2228
\| * \| \| \| \| \|	Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settings	Yorick Peterse	2015-12-28	7	-33/+122
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-gitlab-yml-syntax' into 'master'	Yorick Peterse	2015-12-28	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed syntax in gitlab.yml.example See merge request !2230
\| * \| \| \| \| \|	Fixed syntax in gitlab.yml.example	Yorick Peterse	2015-12-28	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'restart-settings-are-moved-too' into 'master'	Dmitriy Zaporozhets	2015-12-28	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restart settings are moved too. See merge request !2226
\| * \| \| \| \| \|	Restart settings are moved too.	Sytse Sijbrandij	2015-12-28	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue-weight-contributing' into 'master'	Sytse Sijbrandij	2015-12-28	1	-0/+22
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add issue weight to contributing cc @dzaporozhets See merge request !2223
\| * \| \| \| \| \|	add issue weight to contributingissue-weight-contributing	Job van der Voort	2015-12-28	1	-0/+22
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'influxdb' into 'master'	Dmitriy Zaporozhets	2015-12-28	31	-12/+1693
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Storing of application metrics in InfluxDB This adds support for tracking metrics in InfluxDB, which in turn can be visualized using Grafana. For more information see #2936. See merge request !2042
\| * \| \| \| \| \| \|	Added host option for InfluxDBinfluxdb	Yorick Peterse	2015-12-28	2	-1/+3
\| \| \| \| \| \| \| \|