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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| * \| \| \| \|	Remove unused authorization from controller	Felipe Artur	2016-04-20	1	-5/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Show project members only for members	Felipe Artur	2016-04-18	1	-1/+6
\| \|/ / / /
* \| \| \| \|	Merge branch 'ci-commit-as-pipeline' into 'master'	Kamil Trzciński	2016-04-21	2	-5/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
\| * \ \ \ \	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipeline	Kamil Trzcinski	2016-04-19	5	-14/+23
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \ \ \ \ \	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-16	8	-36/+80
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \|	Optimise Merge Request builds rendering	Kamil Trzcinski	2016-04-13	1	-2/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Cleanup changes	Kamil Trzcinski	2016-04-13	1	-0/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-13	8	-46/+67
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-11	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/commits/_commit.html.haml
\| * \| \| \| \| \| \| \| \|	Fix specs	Kamil Trzcinski	2016-04-11	1	-2/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use Ci::Commit as Pipeline	Kamil Trzcinski	2016-04-11	3	-3/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Add due_date:time field to Issue model	Mehmet Beydogan	2016-04-20	1	-1/+1
\| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add due_date text field to sidebar issue#show Add ability sorting issues by due date ASC and DESC Add ability to filtering issues by No Due Date, Any Due Date, Due to tomorrow, Due in this week options Add handling issue due_date field for MergeRequest Update CHANGELOG Fix ambigous match for issues#show sidebar Fix SCREAMING_SNAKE_CASE offenses for due date contants Add specs for due date sorting and filtering on issues
* \| \| \| \| \| \| \| \|	Merge branch 'multi-filter-labels' into 'master'	Jacob Schatz	2016-04-20	2	-4/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mutliple label filter Fixes #989 See merge request !3438
\| * \| \| \| \| \| \| \| \|	Label text color comes from JSON	Phil Hughes	2016-04-20	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created issuable singleton to house the filtering
\| * \| \| \| \| \| \| \| \|	get the multi filter labels feature to work on merge request, also escape ↵	Arinde Eniola	2016-04-20	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	characters in the templates to prevent xss attack