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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \|	Merge branch 'fix-huge-mr' into 'master'	Dmitriy Zaporozhets	2014-07-15	23	-302/+337
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix huge merge requests * Refactored suppress logic for diffs * Increase grit memory limit (should mix most of 502 errors when create MR) * show first 100 files for huge diffs Fixes #1424 See merge request !970
\| * \| \| \| \| \|	Fix tests	Dmitriy Zaporozhets	2014-07-15	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Refactor diff suppress logic and diff views	Dmitriy Zaporozhets	2014-07-15	17	-192/+165
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Cleanup diff stats UI	Dmitriy Zaporozhets	2014-07-15	2	-16/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Refactor MR build process	Dmitriy Zaporozhets	2014-07-15	7	-116/+169
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Increase grit memory limit	Dmitriy Zaporozhets	2014-07-15	1	-1/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'show_milestone_status_on_show_page' into 'master'	Dmitriy Zaporozhets	2014-07-15	2	-3/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show milestone status on group milestone show page Closes #1430 See merge request !969
\| * \| \| \| \|	Fix test for no milestone description.	Marin Jankovski	2014-07-15	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Show milestone state on group milestone show page.	Marin Jankovski	2014-07-15	1	-2/+2
\|/ / / / /
* \| \| \| \|	Milestone is closed only if all milestones are closed.	Marin Jankovski	2014-07-14	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'branches_with_no_parent' into 'master'	Dmitriy Zaporozhets	2014-07-14	3	-72/+81
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Branches with no parent cannot be merged Solves `undefined method 'reduce' for false:FalseClass` Fixes #1415 See merge request !967
\| * \| \| \| \|	Error message needs to be correct.	Marin Jankovski	2014-07-14	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Branches without parent commit cannot be merged.	Marin Jankovski	2014-07-14	3	-72/+81
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'satellite_chdir' into 'master'	Dmitriy Zaporozhets	2014-07-14	3	-2/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove thread-unsafe Dir.chdir from Satellite#lock See merge request !968
\| * \| \| \| \| \|	Remove thread-unsafe Dir.chdir from Satellite#lock	Jacob Vosmaer	2014-07-14	3	-2/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is made possible by changes in gitlab-grit 2.6.10.
* \| \| \| \| \|	Merge pull request #7131 from skv-headless/per_request_rules_caching	Dmitriy Zaporozhets	2014-07-14	3	-24/+29
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	per request project rules caching
\| * \| \| \| \| \|	per request project rules caching	skv-headless	2014-06-14	3	-24/+29
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #7196 from cirosantilli/patch-2	Dmitriy Zaporozhets	2014-07-14	1	-31/+37
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Enforce md style.
\| * \| \| \| \| \|	Enforce md style.	Ciro Santilli	2014-06-25	1	-31/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- multiple blank lines before header - skip header level - colon at end of header - break very long lines - align definition like lists at marker - case typos - informal contractions
* \| \| \| \| \| \|	Restore blue color for sign-in button	Dmitriy Zaporozhets	2014-07-14	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge pull request #7285 from jvanbaarsen/fixed-wrong-permission	Dmitriy Zaporozhets	2014-07-14	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A Developer cannot manage milestones
\| * \| \| \| \| \| \|	A Developer cannot manage milestones	Jeroen van Baarsen	2014-07-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'improve-login-page' into 'master'	Dmitriy Zaporozhets	2014-07-13	4	-18/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve login page * use max-width for brand logo to prevent stretch of small images * improve default brand logo to be centred on any kind of screen * hide logo for small screens * hide text for xs screens * reduce amount of text on sign-in page Fixes #1423 See merge request !966
\| * \| \| \| \| \| \| \|	Improve login page behaviour	Dmitriy Zaporozhets	2014-07-13	4	-18/+24
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'redirect_on_signin' into 'master'	Dmitriy Zaporozhets	2014-07-11	8	-15/+41
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redirect on signin Fixes #1346 See merge request !965
\| * \| \| \| \| \| \|	Add in the tests.	Marin Jankovski	2014-07-11	2	-1/+48
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use devise stored_location to redirect after signing for both public and ↵	Marin Jankovski	2014-07-11	3	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	private pages.
\| * \| \| \| \| \| \|	Revert "Merge branch 'redirect_after_login' into 'master'"	Marin Jankovski	2014-07-11	7	-42/+7
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 5aaa35656edaf309354528e197a54461f584ed21, reversing changes made to 5b8c1767676b94f58558e6de320965c68b57de42.
* \| \| \| \| \| \|	Make brand image fill 100% width of space	Dmitriy Zaporozhets	2014-07-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Add bottom links for sign-in page so I can get to Public area	Dmitriy Zaporozhets	2014-07-11	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Rename brand helper	Dmitriy Zaporozhets	2014-07-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'ee-login-layout' into 'master'	Dmitriy Zaporozhets	2014-07-11	14	-125/+164
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE login layout Port login layout from EE See merge request !964
\| * \| \| \| \| \| \|	Small fixes for sign-in page text	Dmitriy Zaporozhets	2014-07-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Less distracting git clone line for public page	Dmitriy Zaporozhets	2014-07-11	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Improve signin/signup/reset pages UI	Dmitriy Zaporozhets	2014-07-11	9	-116/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Add box shadow to login box	Dmitriy Zaporozhets	2014-07-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Improve login page for small screens	Dmitriy Zaporozhets	2014-07-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Fix brand logo	Dmitriy Zaporozhets	2014-07-11	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Use same login layout between CE and EE versions	Dmitriy Zaporozhets	2014-07-11	4	-11/+44
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'update-architecture-diagram' into 'master'	Dmitriy Zaporozhets	2014-07-11	2	-0/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update architecture diagram Update the diagram and make clear that rails accesses the repo's via shell. When done submit to partner. See merge request !962
\| * \| \| \| \| \| \|	Updated the picture based on comments.	Sytse Sijbrandij	2014-07-10	2	-0/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update the diagram and make clear that rails accesses the repo's via shell.	Sytse Sijbrandij	2014-07-10	2	-0/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'escape-before-autolink' into 'master'	Dmitriy Zaporozhets	2014-07-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Escape before autolink Because auto_link set description to html_safe but dont escape html!!! :( See merge request !963
\| * \| \| \| \| \| \| \|	Add html_escape to project description. auto_link set description to ↵	Dmitriy Zaporozhets	2014-07-11	1	-1/+1
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	html_safe but! dont escape html :(. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2014-07-10	11	-19/+74
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'upgrade_devise' into 'master'	Dmitriy Zaporozhets	2014-07-10	11	-19/+74
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade devise from 3.0.4 to 3.2.4 See merge request !960
\| \| * \| \| \| \| \| \|	Override strong params for sign up.	Marin Jankovski	2014-07-10	2	-1/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Update to accomodate devise deprecations and backward incompatible changes.	Marin Jankovski	2014-07-10	5	-5/+8
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Check for the correct param for token.	Marin Jankovski	2014-07-10	1	-1/+6
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Try to keep token authenticable compatibility	Marin Jankovski	2014-07-09	4	-5/+48
\| \| \| \| \| \| \| \| \|