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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add support for git lfs.lfs	Marin Jankovski	2015-11-16	23	-13/+1226
\|
*	Merge branch 'test_env_cache' into 'master'	Valery Sizov	2015-11-16	2	-9/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Disabling cache for test environment See merge request !1807
\| *	Disabling cache for test environment	Valery Sizov	2015-11-16	2	-9/+13
\| \|
* \|	Merge branch 'fix_trailing_title_space' of ↵	Dmitriy Zaporozhets	2015-11-16	3	-2/+7
\|\ \ \| \| \| \| \| \| \| \| \|	https://gitlab.com/dblessing/gitlab-ce
\| * \|	Fix trailing space issue with merge requests and issues. Fixes #2514	Drew Blessing	2015-11-10	3	-2/+7
\| \| \|
* \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2015-11-16	3	-28/+21
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'rs-revert-gh-9812' into 'master'	Valery Sizov	2015-11-16	1	-27/+19
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider" This reverts commit 84999611d8f7894219eb4ebc76555c79b1f14794, reversing changes made to 0d9fb211f3f842d10e1c57dcb9d3d42a9c11cd0b. See merge request !1805
\| \| * \|	Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"rs-revert-gh-9812	Robert Speicher	2015-11-15	1	-27/+19
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 84999611d8f7894219eb4ebc76555c79b1f14794, reversing changes made to 0d9fb211f3f842d10e1c57dcb9d3d42a9c11cd0b.
\| * \|	Merge branch 'relative_links_default_branch' into 'master'	Robert Speicher	2015-11-15	2	-1/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relative links in project README should point to default branch, not master Relative links in the README shown on a project's main page currently always point to the "master" branch. This is a particularly obvious problem for projects that have no "master" branch, since the link points to a non-existent file. This patch changes the relative links to instead point to the default branch. Resolves #2707, #1134, #1852 See merge request !1801
\| \| * \|	Relative links in the README file shown on the repository homepage should point	Alec Cooper	2015-11-14	2	-1/+2
\| \|/ / \| \| \| \| \| \| \| \| \|	to the default branch, not to master
* \| \|	Merge branch 'releases-feature'	Dmitriy Zaporozhets	2015-11-16	14	-203/+362
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Improve english textreleases-feature	Dmitriy Zaporozhets	2015-11-16	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add api test for creating tag with release info	Dmitriy Zaporozhets	2015-11-12	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add API docs and correctly expose release api	Dmitriy Zaporozhets	2015-11-12	3	-26/+57
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Expose release notes to tags api	Dmitriy Zaporozhets	2015-11-12	2	-5/+31
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add releases api	Dmitriy Zaporozhets	2015-11-12	3	-2/+36
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add grape routing print	Dmitriy Zaporozhets	2015-11-12	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Move git tags API to separate file	Dmitriy Zaporozhets	2015-11-12	7	-184/+209
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add release notes documentation	Dmitriy Zaporozhets	2015-11-12	4	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Fix changelog item	Dmitriy Zaporozhets	2015-11-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'impersonate' into 'master'	Dmitriy Zaporozhets	2015-11-14	9	-35/+88
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactor login as to be impersonation with better login/logout Modifies the existing "login as" feature to be called impersonation. This also adds: * Application keep track of who is impersonating the user so they can revert back to the original user without having to log out. * Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop. ## Screenshots: ![](http://sindacio.us/i/2015-10-28_17-52-41.png) ![](http://sindacio.us/i/2015-10-28_17-53-08.png) See merge request !1702
\| * \| \|	refactor login as to be impersonation with better login/logout	James Newton	2015-10-29	9	-35/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modifies the existing "login as" feature to be called impersonation, as well as keeping track of who is impersonating to revert back to that user without having to log out.
* \| \| \|	Merge branch 'annotate-models' into 'master'	Dmitriy Zaporozhets	2015-11-14	48	-96/+311
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Annotate models Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1799
\| * \| \| \|	Annotate models	Dmitriy Zaporozhets	2015-11-13	48	-96/+311
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'builds_feature' into 'master'	Kamil Trzciński	2015-11-13	27	-144/+139
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose builds feature Expose builds feature in project settings (as feature). Enable it by default for a new projects. I deliberately named it builds instead of CI, because we actualy allow to run tests using infrastructure built-in GitLab. I'm free to change it. ![Screen_Shot_2015-11-09_at_16.42.21](/uploads/a8af0a56fc0498688c0428ff22252d9c/Screen_Shot_2015-11-09_at_16.42.21.png) If we are ok, I'll add feature tests for it. /cc @sytses @dzaporozhets See merge request !1767
\| * \| \| \|	Fix caching breaking test of build artifactsbuilds_feature	Kamil Trzcinski	2015-11-13	1	-6/+3
\| \| \| \| \|
\| * \| \| \|	Fix broken tests	Kamil Trzcinski	2015-11-13	7	-113/+43
\| \| \| \| \|
\| * \| \| \|	Expose CI enable option in project features	Kamil Trzcinski	2015-11-13	20	-25/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Enable CI by default for all new projects
* \| \| \| \|	Merge branch 'refactor-complex-methods' into 'master'	Dmitriy Zaporozhets	2015-11-13	8	-155/+200
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor complex methods Make flog part of CI check which is not allowed to fail. I used high score (70) and refactored most complex method. In future releases we should lower acceptable score to something like 40..50 Part of #3444 See merge request !1794
\| * \| \| \| \|	Move spec to proper place and fix unused variablerefactor-complex-methods	Dmitriy Zaporozhets	2015-11-13	2	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Don't allow flog failure any more	Dmitriy Zaporozhets	2015-11-13	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Even more refactoring to inline_diff.rb	Dmitriy Zaporozhets	2015-11-13	1	-16/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Split complex methods in GoogleCodeImport::Importer	Dmitriy Zaporozhets	2015-11-13	1	-46/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Split complex Gitlab::InlineDiff::processing method	Dmitriy Zaporozhets	2015-11-13	1	-19/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Split complex method EventsHelper#event_feed_url.	Dmitriy Zaporozhets	2015-11-13	1	-11/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Split complex method Issues::UpdateService#execute	Dmitriy Zaporozhets	2015-11-13	1	-13/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Split complex method SystemHooksService#build_event_data	Dmitriy Zaporozhets	2015-11-13	1	-30/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Split huge method MergeRequests::UpdateService#execute	Dmitriy Zaporozhets	2015-11-13	1	-22/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'gitlab-workhorse' into 'master'	Kamil Trzciński	2015-11-13	2	-0/+2
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Gitlab Workhorse See merge request !1795
\| * \| \| \| \|	Bump the GITLAB_WORKHORSE version to 0.4.1 [ci skip]	Kamil Trzcinski	2015-11-13	2	-0/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #9825 from huacnlee/cache-application-setting	Dmitriy Zaporozhets	2015-11-13	2	-3/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add caching for ApplicationSetting, Ci::ApplicationSetting.
\| * \| \| \| \|	Add caching for ApplicationSetting, Ci::ApplicationSetting.	Jason Lee	2015-11-12	2	-3/+15
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ApplicationSetting.current was called in every pages, cache it and expires it after it updated. This changes will avoid a SQL query in every pages (~0.3 - 0.5ms). ```SQL SELECT "application_settings".* FROM "application_settings" ORDER BY "application_settings"."id" DESC LIMIT 1 ```
* \| \| \| \|	Merge pull request #9757 from yms9654/diff-option	Stan Hu	2015-11-13	13	-8/+80
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add ignore white space option in merge request diff
\| * \| \| \| \|	Add ignore white space option in merge request diff	Minsik Yoon	2015-11-13	13	-8/+80
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
* \| \| \| \|	Merge branch 'omniauth-doc-fix' into 'master'	Achilleas Pipinellis	2015-11-13	2	-1/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing "omniauth" prefix to option in docs This MR is specifically a fix for #3319. I wanted to make my first contribution to GitLab, so I picked a simple one! This changes the omniauth documentation for the `block_auto_created_users` option to `omniauth_block_auto_created_users`. Thanks --- closes #3319 See merge request !1734
\| * \| \| \|	Merge remote-tracking branch 'gitlab/master' into omniauth-doc-fix	Jon Cairns	2015-11-12	303	-1072/+4720
\| \|\ \ \ \
\| * \| \| \| \|	Add missing "omniauth" prefix to option in docs [ci skip]	Jon Cairns	2015-11-12	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes block_auto_created_users to omniauth_block_auto_created_users, otherwise the option is ignored. Fixes #3319.
* \| \| \| \| \|	Merge branch 'use-path-for-new-issue-button' into 'master'	Dmitriy Zaporozhets	2015-11-12	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a relative link instead of full URL with New Issue button to be consistent Relates to #3095 See merge request !1631
\| * \| \| \| \|	Use a relative link instead of full URL with New Issue button to be consistent	Stan Hu	2015-10-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relates to #3095
* \| \| \| \| \|	Merge branch 'fix-avatar-not-showing' of https://gitlab.com/stanhu/gitlab-ce	Dmitriy Zaporozhets	2015-11-12	5	-4/+5
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|