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

	Commit message (Collapse)	Author	Age	Files	Lines
*	show only the eanbled oauth providers	Andrei Gliga	2016-05-12	1	-1/+1
\|
*	render the omniauth_box if there are any button_based_providers	Andrei Gliga	2016-05-12	1	-1/+1
\|
*	method to check if oauth button based providers are enabled	Andrei Gliga	2016-05-12	1	-0/+4
\|
*	method to get the enabled_button_based_providers	Andrei Gliga	2016-05-12	1	-0/+6
\|
*	OAuth Providers disable from the ApplicationSettings page	Andrei Gliga	2016-05-12	2	-0/+25
\|
*	default value for disabled_oauth_sign_in_sources in create_from_defaults @ ↵	Andrei Gliga	2016-05-12	1	-0/+1
\| \| \| \|	ApplicationSetting
*	disabled_oauth_sign_in_sources parameter handling in ↵	Andrei Gliga	2016-05-12	1	-1/+11
\| \| \| \|	ApplicationSettingsController
*	serialize the disabled_oauth_sign_in_sources	Andrei Gliga	2016-05-12	1	-0/+50
\|
*	disabled_oauth_sign_in_sources column	Andrei Gliga	2016-05-12	2	-0/+6
\|
*	Merge branch 'update-8-8-guides' into 'master'	Yorick Peterse	2016-05-12	2	-1/+155
\|\ \| \| \| \| \| \| \| \|	Update 8.8 guides See merge request !4119
\| *	Update 8.8 guides	Valery Sizov	2016-05-11	2	-1/+155
\| \|
* \|	Merge branch '16568-relative-links-wiki-regression' into 'master'	Rémy Coutable	2016-05-12	3	-3/+96
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relative Links in the Wiki Are Broken - [ ] #16568 (!4050) Relative links in wiki are broken - [x] Investigate issue - [x] Implementation / Fix - [x] Write (failing) tests for `WikiLinkFilter` - [x] Link to `./bar` should either get rewritten correctly or left alone - [x] Link to `./bar.md` should maybe get rewritten correctly (is left alone currently) - [x] Link to `bar.md` should get rewritten correctly - [x] Check if this indeed a bug - [x] Make sure CI is green - [x] Assign to endboss - [x] Wait for review - [x] Implement review feedback - [ ] Wait for merge See merge request !4050
\| * \|	Add CHANGELOG entry.	Timothy Andrew	2016-05-12	1	-0/+3
\| \| \|
\| * \|	Implement @rymai's feedback after review.	Timothy Andrew	2016-05-12	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Separate 'exercise' and 'verify' steps of tests. - Use `build_stubbed` instead of `build`
\| * \|	Add a spec for `WikiLinkFilter`	Timothy Andrew	2016-05-12	2	-3/+85
\|/ / \| \| \| \| \| \|	- And fix behavior for non-file hierarchical links.
* \|	Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master'	Douwe Maan	2016-05-11	8	-24/+111
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add snippet tab under user profile Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15572 See merge request !4001
\| * \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Long Nguyen	2016-05-11	213	-3147/+1276
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	issue_15572_snippets_tab_under_user_profile
\| * \| \|	Code improve	Long Nguyen	2016-05-10	2	-18/+19
\| \| \| \|
\| * \| \|	Add specs for user routing and update spec for user controller	Long Nguyen	2016-05-08	2	-0/+59
\| \| \| \|
\| * \| \|	Routing refactoring	Long Nguyen	2016-05-08	6	-23/+20
\| \| \| \|
\| * \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Long Nguyen	2016-05-08	181	-580/+1510
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issue_15572_snippets_tab_under_user_profile
\| * \| \| \|	Fix routing error	Long Nguyen	2016-05-08	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	user routings refactor	Long Nguyen	2016-05-08	9	-32/+64
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Long Nguyen	2016-05-05	227	-1341/+3520
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issue_15572_snippets_tab_under_user_profile
\| * \| \| \| \|	Remove unused view and update redirect when destroy snippet	Long Nguyen	2016-05-05	2	-14/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove unused code, update spec, and update changelog	Long Nguyen	2016-05-05	3	-27/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Add snippet tab under user profile	Long Nguyen	2016-05-02	4	-3/+39
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-remove-icon_for_event' into 'master'	Douwe Maan	2016-05-11	1	-9/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused `icon_for_event` helper Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090 See merge request !4120
\| * \| \| \| \| \|	Remove unused `icon_for_event` helper	Robert Speicher	2016-05-11	1	-9/+0
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'no-todo-badge-on-zero' into 'master'	Jacob Schatz	2016-05-11	1	-2/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't show the Todo count if there aren't any Todos. When there are 0 Todos, the Todos icon still had the blue badge with a "0" in it, which made me think I had a new Todo left. This makes it less annoying. Follow-up on !4077. Before: ![Screen_Shot_2016-05-10_at_9.36.57_PM](/uploads/e0dfafae01692286096606c3251f0997/Screen_Shot_2016-05-10_at_9.36.57_PM.png) After: ![Screen_Shot_2016-05-10_at_10.01.02_PM](/uploads/30a8bafe8f54862418eb4045e5777a9a/Screen_Shot_2016-05-10_at_10.01.02_PM.png) cc: @jschatz1 @rspeicher See merge request !4113
\| * \| \| \| \| \|	Don't show the Todo count if there aren't any Todos.	Connor Shea	2016-05-10	1	-2/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When there are 0 Todos, the Todos icon still had the blue badge with a "0" in it, which made me think I had a new Todo left. This makes it less annoying. Follow-up on !4077.
* \| \| \| \| \|	Merge branch 'hook-docs-behavior' into 'master'	Robert Speicher	2016-05-11	5	-6/+21
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve documentation and web test for web hooks Tips and documentation of actual hook behavior. Improved user feedback when testing hooks via the web UI. See merge request !4015
\| * \| \| \| \|	Remove extra sanitization	Jacob Vosmaer	2016-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Robert Speicher and I believe this string gets sanitized further down the stack anyway. Doing this in a model class feels wrong.
\| * \| \| \| \|	Fix test failures	Jacob Vosmaer	2016-05-09	2	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Remove space	Jacob Vosmaer	2016-05-09	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Always mention HTTP status	Jacob Vosmaer	2016-05-03	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Inform user about questionable hook success	Jacob Vosmaer	2016-05-03	1	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Improve documentation and web test for web hooks	Jacob Vosmaer	2016-05-03	3	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I wanted to share what I learned trying to debug web hooks using netcat.
* \| \| \| \| \|	Merge branch '17356-remove-monkey_patch' into 'master'	Robert Speicher	2016-05-11	1	-48/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Rails monkey-patches now that we're using Rails 4.2.6 Closes #17356. See merge request !4115
\| * \| \| \| \| \|	Remove Rails monkey-patches now that we're using Rails 4.2.6	Rémy Coutable	2016-05-11	1	-48/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'improve-destroy-logging' into 'master'	Robert Speicher	2016-05-11	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve log message when a project is destroyed to include the namespace See merge request !4114
\| * \| \| \| \| \| \|	Improve log message when a project is destroyed to include the namespace	Stan Hu	2016-05-10	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '17249-starred' into 'master'	Robert Speicher	2016-05-11	6	-15/+36
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restrict starred projects to viewable ones `User#starred_projects` doesn't perform any visibility checks. This has a couple of problems: 1. It assumes a user can always view all of their starred projects in perpetuity (project not changed to private, access revoked, etc.). 2. It assumes that we'll only ever allow a user to star a project they can view. This is currently the case, but bugs happen. Add `User#viewable_starred_projects` to filter the starred projects by those the user either has explicit access to, or are public or internal. Then use that in all places where we list the user's starred projects. Closes #17249. See merge request !4108
\| * \| \| \| \| \| \| \|	Tidy up user project specs	Sean McGivern	2016-05-11	2	-14/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Restrict starred projects to viewable ones	Sean McGivern	2016-05-10	6	-15/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`User#starred_projects` doesn't perform any visibility checks. This has a couple of problems: 1. It assumes a user can always view all of their starred projects in perpetuity (project not changed to private, access revoked, etc.). 2. It assumes that we'll only ever allow a user to star a project they can view. This is currently the case, but bugs happen. Add `User#viewable_starred_projects` to filter the starred projects by those the user either has explicit access to, or are public or internal. Then use that in all places where we list the user's starred projects.
* \| \| \| \| \| \| \| \|	Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' ↵	Robert Speicher	2016-05-11	7	-55/+83
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Only generate repository push email once The repository push email can be very expensive to generate, especially with syntax-highlighted diffs. Instead of generating the email for each recipient, generate one email object and reset the Message-Id and To headers for each recipient. (Cloning would also be expensive in the case of large emails, although probably not as bad as generating from scratch.) Closes #17270. See merge request !4070
\| * \| \| \| \| \| \| \| \|	Only generate repository push email once	Sean McGivern	2016-05-11	7	-55/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The repository push email can be very expensive to generate, especially with syntax-highlighted diffs. Instead of generating the email for each recipient, generate one email object and reset the Message-Id and To headers for each recipient. (Cloning would also be expensive in the case of large emails, although probably not as bad as generating from scratch.)
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-changelog-874' into 'master'	Yorick Peterse	2016-05-11	1	-3/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated 8.7.4 CHANGELOG entries See merge request !4116
\| * \| \| \| \| \| \| \| \|	Updated 8.7.4 CHANGELOG entries	Yorick Peterse	2016-05-11	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch 'casecmp-cop' into 'master'	Rémy Coutable	2016-05-11	4	-6/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Rubocop Casecmp Performance Cop. Also fixes the errors caused by enabling the cop. `casecmp` is more performant than `.downcase` and `==`. See also: https://github.com/bbatsov/rubocop/blob/master/lib/rubocop/cop/performance/casecmp.rb See merge request !3957