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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \|	Finish refactor	Jacob Vosmaer	2016-03-07	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove outdated comment	Jacob Vosmaer	2016-03-04	1	-1/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Put 'hidden commits' logic in CommitsHelper	Jacob Vosmaer	2016-03-04	3	-12/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Limit the number of commits shown in MRs	Jacob Vosmaer	2016-03-04	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents timeouts when creating a MR with 1000s of commits.
\| * \| \| \| \| \|	Show at most 100 commits in the web UI	Jacob Vosmaer	2016-03-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When rendering 1 commit takes over 5ms (on my laptop: around 9ms), it saves seconds in rendering time to show 100 instead of 500 commits.
* \| \| \| \| \| \|	Merge branch 'rs-bump-poltergeist' into 'master'	Dmitriy Zaporozhets	2016-03-09	2	-3/+3
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump poltergeist to `~> 1.9.0` See merge request !3116
\| * \| \| \| \| \|	Bump poltergeist to `~> 1.9.0`rs-bump-poltergeist	Robert Speicher	2016-03-07	2	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'retry-tests' into 'master'	Kamil Trzciński	2016-03-09	8	-36/+83
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Retry failed tests This is to make the CI builds more reliable due to large amount of timeouts and deadlocks recently. See merge request !1793
\| * \| \| \| \| \|	Fix script error	Kamil Trzcinski	2016-03-09	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Retry apt-get installation and bundle install	Kamil Trzcinski	2016-03-09	2	-8/+20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Retry spinach tests	Kamil Trzcinski	2016-03-09	5	-28/+53
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Retry failed tests	Kamil Trzcinski	2016-03-09	4	-0/+10
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'iurisilvio/gitlab-ce-bitbucket_closed' into 'master'	Rémy Coutable	2016-03-09	3	-1/+90
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where Bitbucket 'closed' issues were imported as 'opened' _Originally opened at !2930 by @iurisilvio._ - - - Bitbucket has an undocumented status `closed`. https://confluence.atlassian.com/bitbucket/issues-resource-296095191.html Related to https://gitlab.com/gitlab-com/support-forum/issues/559 See merge request !2973
\| * \| \| \| \| \|	Fix bug where Bitbucket `closed` issues were imported as `opened`iurisilvio/gitlab-ce-bitbucket_closed	Iuri de Silvio	2016-03-07	3	-1/+90
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'update-db-schema' into 'master'	Yorick Peterse	2016-03-09	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !3136
\| * \| \| \| \| \|	Added main_language to the schema	Yorick Peterse	2016-03-09	1	-0/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This wasn't included in gitlab-org/gitlab-ce!3000.
* \| \| \| \| \|	Merge branch 'fix/upgrader-docs' into 'master'	Achilleas Pipinellis	2016-03-09	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix master branch link to upgrader.md See merge request !2967
\| * \| \| \| \| \|	Fix URL to upgrader guide	Jonas Friedmann	2016-03-09	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-03-09	21	-69/+42
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'rs-traits-are-good' into 'master'	Dmitriy Zaporozhets	2016-03-09	8	-36/+32
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make better use of the `visibility_level` factory traits See merge request !3131
\| \| * \| \| \| \| \| \|	Make better use of the `visibility_level` factory traitsrs-traits-are-good	Robert Speicher	2016-03-08	5	-20/+19
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Simplify the various Snippet factories	Robert Speicher	2016-03-08	3	-16/+13
\| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'rs-snippets-dont-expire' into 'master'	Dmitriy Zaporozhets	2016-03-09	13	-33/+10
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `Snippet#expires_at` This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years. See merge request !3103
\| \| * \| \| \| \| \| \|	Remove `Snippet#expires_at`rs-snippets-dont-expire	Robert Speicher	2016-03-05	13	-33/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years.
* \| \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2016-03-09	2	-2/+6
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'security_bug_fix_close_issue' into 'master'	Douwe Maan	2016-03-05	2	-2/+6
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Security] Automatic issue closing Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2640 See merge request !1944
\| \| * \| \| \| \| \| \| \|	Security: Fix issue auto closing	Valery Sizov	2016-03-03	2	-2/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'improve-archived-projects'	Dmitriy Zaporozhets	2016-03-09	16	-69/+93
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Updated project list dropdown to use dropdown classesimprove-archived-projects	Phil Hughes	2016-03-05	2	-32/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Align projects sort checkbox	Dmitriy Zaporozhets	2016-03-04	2	-1/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Fix test	Dmitriy Zaporozhets	2016-03-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Show active sorting method for projects list	Dmitriy Zaporozhets	2016-03-04	2	-21/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Add test for archive toggle feature	Dmitriy Zaporozhets	2016-03-04	3	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Add projects list sort dropdown to group page	Dmitriy Zaporozhets	2016-03-04	2	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Make projects sort dropdown shared so it can be reused for other pages	Dmitriy Zaporozhets	2016-03-04	4	-23/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Add option to show archived projects on dahsboard	Dmitriy Zaporozhets	2016-03-04	4	-22/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \|	Merge branch 'branch-tag-count-methods' into 'master'	Robert Speicher	2016-03-08	6	-14/+155
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use dedicated methods for counting branches and tags This started out as "Lets add two methods to count and cache some data" and ended up in a clean-up/fix of some existing code. The two problems were: 1. Different code was used for adding/removing branches/tags via Git and the UI 2. The code used for the UI didn't have any RSpec tests, and I couldn't find any Spinach tests either (though grepping for Spinach stuff is hard) This MR addresses the following: 1. `Repository#branch_count` and `Repository#tag_count` are used to count and cache the number of branches/tags, these methods are then used on the branches/commits/tags pages. 2. `Repository#add_tag`, `Repository#add_branch`, `Repository#rm_tag` and `Repository#rm_branch` now all the appropriate before/after hook methods instead of calling a random single cache expiration method. This ensures caches are properly flushed when adding/removing tags/branches via the UI. 3. RSpec tests were added for the above methods. This fixes gitlab-org/gitlab-ce#13459 See merge request !3128
\| * \| \| \| \| \| \| \| \| \|	Call after_create_branch in Repository#add_branchbranch-tag-count-methods	Yorick Peterse	2016-03-08	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures the right caches are flushed when adding a branch via the UI, instead of only flushing this one random cache.
\| * \| \| \| \| \| \| \| \| \|	Call the right hooks in Repository#add_tag	Yorick Peterse	2016-03-08	2	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures Repository#add_tag calls Repository#before_push_tag instead of just 1 random cache expiration method.
\| * \| \| \| \| \| \| \| \| \|	Added specs for Repository#rm_tag	Yorick Peterse	2016-03-08	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Call the right hooks when removing branches	Yorick Peterse	2016-03-08	2	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that Repository#rm_branch calls before_remove_branch/after_remove_branch instead of just 1 random cache expiration method.
\| * \| \| \| \| \| \| \| \| \|	Cache & flush tag/branch counts	Yorick Peterse	2016-03-08	6	-10/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The methods used for this are Repository#tag_count and Repository#branch_count which cache their output in Redis as well as memoizing it in an instance variable. Both methods have a corresponding methods/hooks to flush the caches at the right time.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master'	Robert Speicher	2016-03-08	4	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose User#last_sign_in_at and User#confirmed_at for admins Closes #840 See merge request !3090
\| * \| \| \| \| \| \| \| \| \| \|	Add fields to GET /users/* API endpoints for adminsevuez/gitlab-ce-add-info-user-api	evuez	2016-03-04	4	-0/+7
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added fields are last_sign_in_at and confirmed_at. They are available for GET /users/ and GET /users/:id for admins. Closes #840
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2016-03-08	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'improve/3102-memoize-group-instance-variable-in-admin-groups-controller' into 'master' Remove instance variable `@group` multiple assignment See merge request !3127
\| * \| \| \| \| \| \| \| \| \| \|	Remove instance variable @group multiple assignment	Yatish Mehta	2016-03-08	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-duplicate-cache_store-in-test-config' into 'master'	Robert Speicher	2016-03-08	1	-2/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate 'cache_store' configuration in test environment [ci skip] See merge request !3061
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate 'cache_store' configuration in test environmentremove-duplicate-cache_store-in-test-config	Rémy Coutable	2016-03-02	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sql-guide' into 'master'	Robert Speicher	2016-03-08	2	-0/+220
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added basic SQL guidelines This is mostly based on the various changes I've made over the past few months. See merge request !3091
\| * \| \| \| \| \| \| \| \| \| \| \|	Added basic SQL guidelinessql-guide	Yorick Peterse	2016-03-08	2	-0/+220
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]