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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Properly check for a pre-existing error in `User#namespace_uniq`rs-fix-user-namespace_uniq	Robert Speicher	2016-02-29	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails adds an empty error to the Errors object even if you just call `#[]` on it: ``` [1] pry(main)> u = User.last [2] pry(main)> u.errors.keys => [] [3] pry(main)> u.errors[:username].present? => false [4] pry(main)> u.errors.keys => [:username] ```
*	Merge branch 'issue_13212' into 'master'	Jacob Schatz	2016-02-29	3	-1/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes padding loss after editing a diff comment Also applies .timeago() to comment datetimes when diff page is entered directly. Also fixes the vertical position of the comment count icon. See merge request !3012
\| *	Merge branch 'master' into issue_13212issue_13212	Alfredo Sumaran	2016-02-29	56	-185/+688
\| \|\
\| * \|	Comment icon vertically aligned	Alfredo Sumaran	2016-02-29	1	-0/+1
\| \| \|
\| * \|	Wrap icon with edited time	Alfredo Sumaran	2016-02-29	2	-2/+2
\| \| \|
\| * \|	Increase padding	Alfredo Sumaran	2016-02-29	1	-1/+1
\| \| \|
\| * \|	Keep edited time on the same line as well	Alfredo Sumaran	2016-02-29	1	-1/+1
\| \| \|
\| * \|	Apply nice date when diff page loads	Alfredo Sumaran	2016-02-29	1	-0/+1
\| \| \|
\| * \|	Keep date in the same line	Alfredo Sumaran	2016-02-29	1	-0/+4
\| \| \|
\| * \|	Prevent content misalignment	Alfredo Sumaran	2016-02-29	1	-0/+8
\| \| \|
* \| \|	Merge branch 'revert-6f85eb38' into 'master'	Dmitriy Zaporozhets	2016-02-29	1	-4/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'issue_5854' into 'master'" This reverts merge request !2992 cc @rdavila See merge request !3013
\| * \| \|	Revert "Merge branch 'issue_5854' into 'master' "revert-6f85eb38	Dmitriy Zaporozhets	2016-02-29	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !2992
* \| \| \|	Merge branch 'fix/project-wiki-ending' into 'master'	Robert Speicher	2016-02-29	3	-3/+23
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for project paths ending in .wiki This prevents `Git operation was rejected by pre-receive hook` when an actual project ending with .wiki is thought to be a wiki by the `Internal` API. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13742 See merge request !2960
\| * \| \|	fixed merge conflict and refactored specs	James Lopez	2016-02-29	1	-6/+2
\| \| \| \|
\| * \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-29	81	-378/+4091
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/project-wiki-ending
\| * \| \| \|	updated internal.rb and spec based on MR feedback	James Lopez	2016-02-26	2	-5/+11
\| \| \| \| \|
\| * \| \| \|	fix changelog [ci skip]	James Lopez	2016-02-25	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-24	13	-44/+71
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/project-wiki-ending
\| * \| \| \| \|	added changelog	James Lopez	2016-02-24	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	fix for projects ending in .wiki	James Lopez	2016-02-24	2	-1/+18
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue_5854' into 'master'	Dmitriy Zaporozhets	2016-02-29	1	-2/+4
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add commit message to JIRA's notification payload. Closes #5854 See merge request !2992
\| * \| \| \| \|	Add commit message to JIRA's notification payload.	Rubén Dávila	2016-02-26	1	-2/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue_13648' into 'master'	Dmitriy Zaporozhets	2016-02-29	2	-14/+22
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve implementation to check read access to forks and add pagination. Fixes #13648 The following optimizations where made: - Pagination was added. - Code to check for read permissions to forks was optimized, in the past we were doing too many queries for each project. See merge request !2991
\| * \| \| \| \| \|	Logged in user should be able to read internal forks.	Rubén Dávila	2016-02-27	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve implementation to check read access to forks and add pagination.	Rubén Dávila	2016-02-26	2	-14/+22
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'fix-migration' into 'master'	Dmitriy Zaporozhets	2016-02-29	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken migration Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For !2927 See merge request !3011
\| * \| \| \| \| \|	Fix broken migration	Dmitriy Zaporozhets	2016-02-29	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'removed-ngprogress' into 'master'	Jacob Schatz	2016-02-29	8	-13/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed NGProgress In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator Ref #13820 ![loading](/uploads/8b6ed8982e86e4b94803b56b8cd97737/loading.gif) See merge request !3004
\| * \| \| \| \| \|	Removed NGProgressremoved-ngprogress	Phil Hughes	2016-02-29	8	-13/+8
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator Ref #13820
* \| \| \| \| \|	Merge branch 'too-many-changes-btns' into 'master'	Jacob Schatz	2016-02-29	1	-6/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed too many changes buttons to white Closes #13751 ![Screen_Shot_2016-02-29_at_09.18.41](/uploads/30f5d11d1a4e1785561597feeeb40f09/Screen_Shot_2016-02-29_at_09.18.41.png) See merge request !3002
\| * \| \| \| \| \|	Changed too many changes buttons to whitetoo-many-changes-btns	Phil Hughes	2016-02-29	1	-6/+5
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13751
* \| \| \| \| \|	Merge branch 'improve-todos-css' into 'master'	Dmitriy Zaporozhets	2016-02-29	2	-35/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Small css cleanup for todos feature Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Cleanup for !2817 Fixes #13816 cc @jschatz1 @skyruler @dbalexandre See merge request !2996
\| * \| \| \| \| \|	Small css cleanup for todos featureimprove-todos-css	Dmitriy Zaporozhets	2016-02-27	2	-35/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'rs-data-links' into 'master'	Douwe Maan	2016-02-29	2	-5/+21
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize `data` and `vbscript` links Closes #13625 Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660 See merge request !2905
\| * \| \| \| \| \| \|	Sanitize `vbscript:` linksrs-data-links	Robert Speicher	2016-02-23	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660
\| * \| \| \| \| \| \|	Sanitize `data:` links	Robert Speicher	2016-02-21	2	-5/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13625
* \| \| \| \| \| \| \|	Merge branch '11489-branded-appearance-to-ce' into 'master'	Douwe Maan	2016-02-29	22	-15/+394
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Branded appearance to CE Closes #11489 The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too. TODO: - [x] Copy docs - [x] Make new screenshots - [ ] Remove Custom Welcome message feature? @rymai: I was unsure what labels to add to ping you, so I just ping you like this :wink: /cc @DouweM See merge request !2927
\| * \| \| \| \| \| \| \|	Branded login page also in CE11489-branded-appearance-to-ce	Zeger-Jan van de Weg	2016-02-26	22	-15/+394
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The only major difference with the EE version is the change from a light and dark logo to only a header logo The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
* \| \| \| \| \| \| \| \|	Merge branch 'issue_13621' into 'master'	Douwe Maan	2016-02-29	3	-1/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't repeat labels listed on Labels tab. Fixes #13622 See merge request !2924
\| * \| \| \| \| \| \| \| \|	Don't repeat labels listed on Labels tab.issue_13621	Rubén Dávila	2016-02-22	3	-1/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ci_examples' into 'master'	Achilleas Pipinellis	2016-02-29	8	-75/+89
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve discoverability for CI examples Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13410 See merge request !3008
\| * \| \| \| \| \| \| \| \| \|	Link to examples page	Achilleas Pipinellis	2016-02-29	3	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \|	Reorganize CI sections and give descriptive names to links	Achilleas Pipinellis	2016-02-29	4	-65/+65
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ci_examples	Achilleas Pipinellis	2016-02-29	16	-46/+290
\| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-development-docs' into 'master'	Douwe Maan	2016-02-29	2	-5/+109
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add "Gotchas" to development docs Also: - Alphabetizes the "Developer" index page - Fixes the broken `db_dump.md` link See merge request !2846
\| * \| \| \| \| \| \| \| \| \|	Update Gotchas docrs-development-docs	Robert Speicher	2016-02-17	1	-8/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \|	Add "Gotchas" development doc	Robert Speicher	2016-02-16	2	-0/+105
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix the "How to dump production data" link	Robert Speicher	2016-02-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \|	Alphabetize Development doc index	Robert Speicher	2016-02-16	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG	Robert Speicher	2016-02-27	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]