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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Changed too many changes buttons to whitetoo-many-changes-btns	Phil Hughes	2016-02-29	1	-6/+5
\| \| \| \|	Closes #13751
*	Update CHANGELOG	Robert Speicher	2016-02-27	1	-3/+4
\| \| \| \|	[ci skip]
*	Merge branch '13679-fix' into 'master'	Achilleas Pipinellis	2016-02-27	2	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust documentation of permissions ## What does this MR do? This MR improves the documentation of the permissions by mentioning that internal projects do not enforce the Guest role. ## Are there points in the code the reviewer needs to double check? No code was touched - only the documentation was adjusted. ## Why was this MR needed? Without this adjustment it might not be clear how you can set up an internal project to be pullable by everyone whilst having the issue tracker and labels managed by permitted people only. ## What are the relevant issue numbers? #13679 See merge request !2925
\| *	Adjust documentation of permissions	Thomas Schmidt	2016-02-27	2	-1/+2
\|/ \| \| \|	[ci skip]
*	Merge branch 'rs-fix-issue-filter-spec' into 'master'	Robert Speicher	2016-02-27	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Fix issue milestone filter spec See merge request !2990
\| *	Fix issue milestone filter specrs-fix-issue-filter-spec	Robert Speicher	2016-02-26	1	-2/+2
\| \|
* \|	Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master'	Robert Speicher	2016-02-26	4	-10/+18
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Strip leading and trailing spaces in URL validator _Originally opened at !2914 by @evuez._ It makes URLs in webhooks valid even if they contain leading and/or trailing spaces. Spaces are hard to notice in input fields, this helps users by accepting leading and trailing spaces in webhooks URLs. Fixes #13652 See merge request !2939
\| *	Allow webhooks URL to have leading and trailing spacesevuez/gitlab-ce-webhook-url-spaces	evuez	2016-02-26	4	-10/+18
\| \|
* \|	Merge branch 'repository-caching-refactor' into 'master'	Robert Speicher	2016-02-26	8	-25/+155
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Refactor Repository Caching Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/13515 See merge request !2936
\| *	Added specs for the various Repository hooksrepository-caching-refactor	Yorick Peterse	2016-02-25	1	-2/+106
\| \|
\| *	Moved exists condition in Repository#before_delete	Yorick Peterse	2016-02-25	1	-6/+4
\| \| \| \| \| \| \| \| \| \|	This is only needed when calling the "expire_cache" method as the other expiration methods don't depend on Git data.
\| *	Move Repository#expire_all_caches to before_delete	Yorick Peterse	2016-02-23	1	-10/+5
\| \|
\| *	Moved cache expiration code to Repository hooks	Yorick Peterse	2016-02-23	7	-14/+47
\| \| \| \| \| \| \| \| \| \|	This keeps all the cache expiration code in a single file/class instead of spreading it all across the codebase.
* \|	Merge branch 'avatar-cropping' into 'master'	Jacob Schatz	2016-02-26	21	-17/+3525
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix avatar stretching by providing a cropping feature Originally by @nesk at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2773 Fixes #7959 See merge request !2951
\| * \|	Update CHANGELOG	Alfredo Sumaran	2016-02-26	1	-0/+1
\| \| \|
\| * \|	Merge branch 'master' into avatar-croppingavatar-cropping	Alfredo Sumaran	2016-02-26	21	-80/+93
\| \|\ \
\| * \ \	Merge branch 'rs-crowd-form-view-spec' into avatar-cropping	Alfredo Sumaran	2016-02-24	9	-44/+103
\| \|\ \ \
\| * \| \| \|	Fix Profile Avatar feature steps	Robert Speicher	2016-02-24	1	-6/+14
\| \| \| \| \|
\| * \| \| \|	Add `:with_avatar` trait to User factory	Robert Speicher	2016-02-24	7	-7/+26
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into avatar-cropping	Alfredo Sumaran	2016-02-24	25	-66/+133
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' into avatar-cropping	Alfredo Sumaran	2016-02-23	321	-4053/+26568
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Minor changes on avatar cropping internals	Johann Pardanaud	2016-02-18	2	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Avoid multiple calls to `validates` for the avatar attributes. - In a cropping process, don't check if the model inherits `User`, check if it responds to `:avatar_crop_size`.
\| * \| \| \| \| \|	Improve avatar cropping internals, based on suggestions made by @rspeicher ↵	Johann Pardanaud	2016-02-17	4	-15/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on !2773
\| * \| \| \| \| \|	Merge branch 'master' into avatar-cropping	Johann Pardanaud	2016-02-16	189	-1269/+3026
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/models/user.rb
\| * \| \| \| \| \| \|	Improve user experience for avatar cropping	Johann Pardanaud	2016-02-16	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Avoid incomprehensible errors on non-integer cropping values - Set the default cropping area to 80%
\| * \| \| \| \| \| \|	Fix failing tests introduced in commit 6d58088	Johann Pardanaud	2016-02-10	1	-2/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix #7959: Fix avatar stretching by providing a cropping feature	Johann Pardanaud	2016-02-09	13	-8/+3489
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sidebar-hide-class' into 'master'	Rémy Coutable	2016-02-26	3	-26/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created helper class to hide content in issue sidebar when collapsed ![Screen_Shot_2016-02-25_at_10.38.39](/uploads/ca49cc230edf7e71b7726e905f523092/Screen_Shot_2016-02-25_at_10.38.39.png) Closes #13764 See merge request !2968
\| * \| \| \| \| \| \| \|	Created helper class to hide content in issue sidebar when collapsedsidebar-hide-class	Phil Hughes	2016-02-25	3	-26/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13764
* \| \| \| \| \| \| \| \|	Merge branch 'feature/slacky-builds-v2' into 'master'	Kamil Trzciński	2016-02-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add builds URL to gitlab-ci script Add builds URL to gitlab-ci script Related to: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2681 See merge request !2962
\| * \| \| \| \| \| \| \| \|	update gitlab-ci script syntax	James Lopez	2016-02-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/feature/slacky-builds-v2' into ↵	James Lopez	2016-02-26	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/slacky-builds-v2 # Conflicts: # .gitlab-ci.yml
\| \| * \| \| \| \| \| \| \| \|	Update URL syntax	James Lopez	2016-02-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	update gitlab-ci script syntax	James Lopez	2016-02-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	gemfile random update	James Lopez	2016-02-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-24	2	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/slacky-builds-v2
\| * \| \| \| \| \| \| \| \| \|	updated gitlab-ci script to include builds URL	James Lopez	2016-02-24	2	-3/+286
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	test	James Lopez	2016-02-24	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	make build fail	James Lopez	2016-02-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	testing script	James Lopez	2016-02-24	1	-285/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'refactor-lists' into 'master'	Dmitriy Zaporozhets	2016-02-26	17	-171/+171
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor html/css for lists and improve help UI page * dry lists html/css removing a lot of style duplicates * fix snippets list to match common style * fix extra bottom margin for groups list * improve help page ui so it looks clean Fixes #11873 See merge request !2977
\| * \| \| \| \| \| \| \| \| \|	Improve help UI page	Dmitriy Zaporozhets	2016-02-26	2	-104/+127
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Fix description margin for groups list	Dmitriy Zaporozhets	2016-02-26	5	-11/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Refactor styles for merge requests list	Dmitriy Zaporozhets	2016-02-26	3	-10/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Refactor styles for issues list	Dmitriy Zaporozhets	2016-02-26	4	-16/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Refactor css for groups list	Dmitriy Zaporozhets	2016-02-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Refactor css for snippets list	Dmitriy Zaporozhets	2016-02-26	3	-28/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Cleanup css for projects list	Dmitriy Zaporozhets	2016-02-26	5	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'coffeescript_syntax_error' into 'master' revert-9cc321ca	Jacob Schatz	2016-02-26	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix syntax error in autosave coffeescript. According to http://coffeescript.org/#try , `catch` needs to have an argument. Otherwise, `Error: Parse error on line 19: Unexpected 'INDENT'` error is raised when converting to JS by coffee-script. Fixes gitlab-org/gitlab-ce#3302 See merge request !2985
\| * \| \| \| \| \| \| \| \| \|	Fix syntax error in autosave coffeescript.coffeescript_syntax_error	Marin Jankovski	2016-02-26	1	-3/+3
\|/ / / / / / / / / /