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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master'	Douwe Maan	2016-05-11	2	-1/+23
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \|	issue_15572_snippets_tab_under_user_profile
\| * \|	user routings refactor	Long Nguyen	2016-05-08	1	-2/+20
\| \| \|
\| * \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Long Nguyen	2016-05-05	13	-70/+110
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	issue_15572_snippets_tab_under_user_profile
\| * \| \|	Remove unused view and update redirect when destroy snippet	Long Nguyen	2016-05-05	1	-1/+1
\| \| \| \|
\| * \| \|	Remove unused code, update spec, and update changelog	Long Nguyen	2016-05-05	1	-19/+1
\| \| \| \|
\| * \| \|	Add snippet tab under user profile	Long Nguyen	2016-05-02	1	-0/+22
\| \| \| \|
* \| \| \|	Merge branch 'hook-docs-behavior' into 'master'	Robert Speicher	2016-05-11	1	-2/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I wanted to share what I learned trying to debug web hooks using netcat.
* \| \| \| \|	Merge branch '17249-starred' into 'master'	Robert Speicher	2016-05-11	2	-2/+2
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \|	Restrict starred projects to viewable ones	Sean McGivern	2016-05-10	2	-2/+2
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`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 'issue_15673' into 'master'	Jacob Schatz	2016-05-10	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add to label ID to response Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15673 See merge request !4023
\| * \| \|	Add to label :id to responseissue_15673	Alfredo Sumaran	2016-05-03	1	-1/+1
\| \|/ /
* \| \|	Log to application.log when an admin starts and stops impersonating a user	Stan Hu	2016-05-04	2	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Closes gitlab-org/gitlab-ee#536
* \| \|	Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'	Douwe Maan	2016-05-04	2	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile.lock
\| * \| \|	API support for the 'since' and 'until' operators on commit requests	Paco Guzman	2016-04-29	2	-3/+3
\| \| \|/ \| \|/\| \| \| \|	- Parameter validation as ISO8601 format
* \| \|	Merge branch 'rs-unique-signup-fields' into 'master'	Douwe Maan	2016-05-04	1	-0/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve uniqueness of field names on the signup form Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075 See merge request !3826
\| * \| \|	Improve uniqueness of field names on the signup formrs-unique-signup-fields	Robert Speicher	2016-04-19	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075
* \| \| \|	Use sign out path only if not empty	Artem Sidorenko	2016-05-03	1	-1/+1
\| \|_\|/ \|/\| \|
* \| \|	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2016-05-02	4	-45/+41
\|\ \ \
\| * \| \|	Store original user in variable	Douwe Maan	2016-04-22	1	-2/+2
\| \| \| \|
\| * \| \|	Remove unused method	Douwe Maan	2016-04-22	1	-4/+0
\| \| \| \|
\| * \| \|	Fix issue with impersonation	Douwe Maan	2016-04-22	4	-45/+45
\| \| \| \|
* \| \| \|	Merge branch '15527-fix-wiki-page-creation-issue' into 'master'	Robert Speicher	2016-05-02	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error when trying to create a wiki page Closes #15527, #15569, #15623, #15630, #15637, #15653, #15870, #16558, #16875, #16987, #17016, https://github.com/gitlabhq/gitlabhq/issues/10317. See merge request !3924
\| * \| \| \|	Fix error when trying to create a wiki page	Rémy Coutable	2016-04-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15527. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'feature/backport-safewebhooks' into 'master'	Robert Speicher	2016-05-02	2	-4/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backported minimal safewebhook implementation to GitLab CE This brings a minimal implementation for gitlab-org/gitlab-ce#13478 backported from EE (gitlab-org/gitlab-ee!334). Also added UI to configure Secret Token Fixes #15365. See merge request !3940
\| * \| \| \| \|	Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooks	Gabriel Mazetto	2016-05-02	2	-4/+18
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Codestyle changes to easy EE merge
* \| \| \| \|	Handle issue move access instead of raising errorfix/handle-issue-move-access	Grzegorz Bizon	2016-04-30	1	-0/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15533
* \| \| \|	Merge branch 'async-new-branch-button' into 'master'	Jacob Schatz	2016-04-28	1	-2/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load the "New Branch" button asynchronously Here's how it looks like for logged in users: ![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif) And here it is for anonymous users (or when a new branch can't be created by a logged in user): ![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif) See merge request !3855
\| * \| \| \|	Load the "New Branch" button asynchronously	Yorick Peterse	2016-04-28	1	-2/+14
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This button depends on Issue#can_be_worked_on? which in turn depends on Issue#related_branches. By rendering this button asynchronously we can finally remove all usages of Issue#related_branches and Issue#referenced_merge_requests from the issues "show" page.
* \| \| \|	Merge branch 'project-deploy-keys-ui' into 'master'	Jacob Schatz	2016-04-28	1	-13/+18
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project deploy keys updated UI Closes #13992 See merge request !3912
\| * \| \|	Project deploy keys updated UI	Phil Hughes	2016-04-25	1	-13/+18
\| \|/ / \| \| \| \| \| \| \| \| \|	Closes #13992
* \| \|	Updated based on feedbacksearch-ui-update	Phil Hughes	2016-04-26	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed some variable names Fixed CHANGELOG entry
* \| \|	Fixed issue with dropdown option not sticking	Phil Hughes	2016-04-26	1	-4/+3
\|/ / \| \| \| \| \| \|	CHANGELOG item
* \|	Fixed issue with assignee object not being returned	Phil Hughes	2016-04-22	2	-2/+2
\| \| \| \| \| \| \| \|	Closes #15515
* \|	Merge branch 'issue_3799' into 'master'	Rémy Coutable	2016-04-22	1	-0/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow filtering by Owned projects on dashboard page Closes #3799 ![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png) See merge request !3762
\| * \	Merge remote-tracking branch 'origin/master' into issue_3799	Alfredo Sumaran	2016-04-21	10	-49/+59
\| \|\ \
\| * \| \|	Use compact syntax	Alfredo Sumaran	2016-04-21	1	-4/+1
\| \| \| \|
\| * \| \|	Allow filtering by Owned projects	Alfredo Sumaran	2016-04-18	1	-0/+5
\| \| \| \|
* \| \| \|	Merge branch 'confirmation-screen' into 'master'	Robert Speicher	2016-04-22	2	-2/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved email confirmation UX Closes #4228 See merge request !3184
\| * \| \| \|	Improved confirmation UXconfirmation-screen	Phil Hughes	2016-04-21	2	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #4228
* \| \| \| \|	Merge branch 'rs-diff_view' into 'master'	Rémy Coutable	2016-04-22	1	-2/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always read diff_view setting from the cookie Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285 See merge request !3732
\| * \| \| \|	Clarify that the diff view setting always comes from the cookiers-diff_view	Robert Speicher	2016-04-19	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This invalidates one test, which we've removed.
* \| \| \| \|	Merge branch 'label-text-color-sidebar' into 'master'	Robert Speicher	2016-04-21	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes text color on labels in sidebar Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color. With this, the text color comes from the JSON. See merge request !3846
\| * \| \| \| \|	Fixes text color on labels in sidebar	Phil Hughes	2016-04-21	2	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'remove-update-files' into 'master'	Yorick Peterse	2016-04-21	2	-2/+0
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed JS update templates See merge request !3814
\| * \| \| \| \|	Removed JS update templatesremove-update-files	Phil Hughes	2016-04-19	2	-2/+0
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'issue_5838' into 'master'	Rémy Coutable	2016-04-21	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show project members only for members fixes #5838 See merge request !3752