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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Make default sorting preference work for Issues and MRs.issue_5546	Rubén Dávila	2016-01-22	3	-4/+16
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into issue_5546	Rubén Dávila	2016-01-22	167	-958/+2863
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Make sorting preference reusable for all projects.	Rubén Dávila	2016-01-22	8	-14/+43
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make cookie suffix more simpler.	Rubén Dávila	2016-01-21	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Little refactor plus some specs.	Rubén Dávila	2016-01-21	6	-12/+52
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remember last sort option used.	Rubén Dávila	2016-01-20	5	-2/+30
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-preventing-migration-from-crashing-in-specific-cases' into ↵	Dmitriy Zaporozhets	2016-01-28	2	-12/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix preventing migration from crashing in very specific cases Closes #12606. Closes #12501. /cc @yorickpeterse @dbalexandre See merge request !2600
\| * \| \| \| \| \| \|	Use ActiveRecord::Base.connection.active? and rescue any exception in ↵fix-preventing-migration-from-crashing-in-specific-cases	Rémy Coutable	2016-01-28	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	connect_to_db? This ensures that rake tasks that don't need a DB connection can be run without one.
\| * \| \| \| \| \| \|	Only create the defaults ApplicationSetting when DB is fully migrated	Rémy Coutable	2016-01-28	1	-19/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return a fake application settings OpenStruct when this is not the case. Also, use ActiveRecord::Base.connection_pool.active_connection? instead of ActiveRecord::Base.connection.active? to avoid driver exception.
\| * \| \| \| \| \| \|	Ensure rake tasks that don't need a DB connection can be run without one	Rémy Coutable	2016-01-26	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When using ActiveRecord::Base.connection.active? without a DB connection, we get a "PG::ConnectionBad: could not connect to server" error because ActiveRecord::Base.connection doesn't exist. By using ActiveRecord::Base.connected? we ensure we don't get this error if the connection is missing, which is the all point of the Gitlab::CurrentSettings#connect_to_db? method!
\| * \| \| \| \| \| \|	Fix preventing migration from crashing in very specific cases	Rémy Coutable	2016-01-25	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/12606 for details
* \| \| \| \| \| \| \|	Merge branch 'improve-mr-api' into 'master'	Dmitriy Zaporozhets	2016-01-28	4	-268/+221
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve consistency and duplication for Merge Request API * Follow REST for merge request API route * Remove repeating comments API for MR Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #4759 and #11810 See merge request !2639
\| * \| \| \| \| \| \| \|	Improve consistency and duplication for Merge Request APIimprove-mr-api	Dmitriy Zaporozhets	2016-01-28	4	-268/+221
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Follow REST for merge request API route * Remove repeating comments API for MR Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'sort-text-removed-from-sort-dropdown' into 'master'	Jacob Schatz	2016-01-28	7	-8/+7
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed sorted text from dropdowns ![Screen_Shot_2016-01-28_at_09.04.36](/uploads/9e0e1fdb45ad12d122f860a2164d9396/Screen_Shot_2016-01-28_at_09.04.36.png) Closes #12796 cc @creamzy @jschatz1 See merge request !2635
\| * \| \| \| \| \| \|	Removed sorted text from dropdowns	Phil Hughes	2016-01-28	7	-8/+7
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12796
* \| \| \| \| \| \|	Merge branch 'numbered-list-rendering-in-comments-cuts-off' into 'master'	Dmitriy Zaporozhets	2016-01-28	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Makes ol margin big enough for 3 digits. Fixes #7960 ![Screen_Shot_2016-01-25_at_11.20.03_PM](/uploads/73c4b9e939fe108fb3b8221e16e686bd/Screen_Shot_2016-01-25_at_11.20.03_PM.png) See merge request !2608
\| * \| \| \| \| \| \|	Makes ol margin big enough for 3 digits.numbered-list-rendering-in-comments-cuts-off	Jacob Schatz	2016-01-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #7960
* \| \| \| \| \| \| \|	Merge branch 'feature/jschatz1/instant-issuable-history' into 'master'	Dmitriy Zaporozhets	2016-01-28	2	-0/+4
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds feature: Ajax Close/Open updates discussion automatically Triggers jQuery event <br/> Fixes #5544 See merge request !2610
\| * \| \| \| \| \| \|	Adds comment about event listenerfeature/jschatz1/instant-issuable-history	Jacob Schatz	2016-01-26	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Adds feature: Ajax Close/Open updates discussion automatically	Jacob Schatz	2016-01-26	2	-0/+3
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Triggers jQuery event Fixes #5544
* \| \| \| \| \| \|	Update gitlab-workhorse versions in documentation	Robert Speicher	2016-01-27	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Update CHANGELOG	Robert Speicher	2016-01-27	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'update-ruby-2.2.4' into 'master'	Douwe Maan	2016-01-27	11	-22/+44
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Ruby version to 2.2.4 (latest previous stable) and update docs Tests and issues added to https://github.com/gitlabhq/gitlabhq/issues/8696 were all fine after the upgrade. Main issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/3340 See merge request !2534
\| * \| \| \| \| \| \|	updated README to include Ruby 2.1	James Lopez	2016-01-27	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	merge spec and spinach jobs	James Lopez	2016-01-27	1	-97/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4	James Lopez	2016-01-27	98	-452/+1134
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	update gitlab ci settings to include ruby 2.1 images	James Lopez	2016-01-27	1	-0/+116
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	updated docs to reflect min requirement of 2.1 [ci skip]	James Lopez	2016-01-27	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	updated docs to reflect version update [ci skip]	James Lopez	2016-01-25	3	-4/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix rubocop new 2.2 syntax issues	James Lopez	2016-01-25	3	-8/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4	James Lopez	2016-01-25	87	-804/+10965
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4	James Lopez	2016-01-22	168	-834/+2997
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # .gitlab-ci.yml
\| * \| \| \| \| \| \| \| \|	update gitlab ci docker image version	James Lopez	2016-01-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	update Ruby version to 2.2.4 (latest previous stable) and update docs	James Lopez	2016-01-21	5	-9/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'events-performance' into 'master'	Robert Speicher	2016-01-27	9	-41/+14
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of retrieving last update times for events See 75195eefcca4cb3961986c90c8e837da02f30134 and https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317 for the juicy details. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415 See merge request !2613
\| * \| \| \| \| \| \| \| \| \|	Use Atom update times of the first eventevents-performance	Yorick Peterse	2016-01-27	7	-34/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By simply loading the first event from the already sorted set we save ourselves extra (slow) queries just to get the latest update timestamp. This removes the need for Event.latest_update_time and significantly reduces the time needed to build an Atom feed. Fixes gitlab-org/gitlab-ce#12415
\| * \| \| \| \| \| \| \| \| \|	Don't pluck project IDs for events	Yorick Peterse	2016-01-26	5	-10/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By instead using a sub-query we save ourselves the overhead of loading any data into memory only to pass it on to another query.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-skip-2fa-on-signout' into 'master'	Robert Speicher	2016-01-27	2	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip the 2FA requirement during logout See merge request !2581
\| * \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG	Robert Speicher	2016-01-27	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Skip the 2FA requirement during logoutrs-skip-2fa-on-signout	Robert Speicher	2016-01-23	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'diff-colors' into 'master'	Robert Speicher	2016-01-27	5	-8/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase contrast between highlighted code comments and inline diff marker. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12737. It was especially bad in Monokai, better now. See merge request !2629
\| * \| \| \| \| \| \| \| \| \| \| \|	Increase contrast between highlighted code comments and inline diff marker.diff-colors	Douwe Maan	2016-01-27	5	-8/+9
\| \| \|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-ci-runners-version-update' into 'master'	Robert Speicher	2016-01-27	7	-6/+42
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CI runner version not being properly updated when asked for a build Due to broken implementation of attribute_for_keys the runner information was not updated correctly. This MR adds test to check that such scenario will never happen again. See merge request !2618
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix CI runner version not being properly updated when asking for a buildfix-ci-runners-version-update	Kamil Trzcinski	2016-01-27	7	-6/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to broken implementation of attribute_for_keys the runner information was not updated correctly. This MR adds test to check that such scenario will never happen again.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/unexistent-group-500' into 'master'	Robert Speicher	2016-01-27	4	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return a 404 instead of a 500 when accessing a non-existent group Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3352 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/5600 See merge request !2614
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-01-27	30	-141/+472
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/unexistent-group-500
\| * \| \| \| \| \| \| \| \| \| \| \| \|	moved and refactored feature based on feedback. Also updated CHANGELOG	James Lopez	2016-01-27	5	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	update fix based on feedback	James Lopez	2016-01-27	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	fix for failing spec	James Lopez	2016-01-26	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	feature and fix for 500 on group missing	James Lopez	2016-01-26	3	-0/+10
\| \| \|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|