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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'issue_3799' into 'master'	Rémy Coutable	2016-04-22	1	-1/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	13	-82/+125
\| \|\
\| * \|	Do not display filters if user if there's no current_user	Alfredo Sumaran	2016-04-21	1	-7/+8
\| \| \|
\| * \|	Allow filtering by Owned projects	Alfredo Sumaran	2016-04-18	1	-1/+9
\| \| \|
* \| \|	Merge branch 'remove-update-files' into 'master'	Yorick Peterse	2016-04-21	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Removed JS update templates See merge request !3814
\| * \|	Removed JS update templatesremove-update-files	Phil Hughes	2016-04-19	1	-1/+1
\| \|/
* \|	Merge branch 'label-dropdown-fix' into 'master'	Jacob Schatz	2016-04-21	4	-52/+42
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes "create label" functionality on label dropdown Issue sidebar ![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif) Issues page ![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif) See merge request !3670
\| * \	Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fix	Alfredo Sumaran	2016-04-20	7	-17/+58
\| \|\ \
\| * \ \	Merge remote-tracking branch 'origin/master' into label-dropdown-fix	Alfredo Sumaran	2016-04-20	5	-12/+25
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/shared/issuable/_sidebar.html.haml
\| * \| \| \|	Move shared html to a partial	Alfredo Sumaran	2016-04-18	3	-34/+21
\| \| \| \| \|
\| * \| \| \|	Add is-link attribute to know if a menu item should not be stopped	Alfredo Sumaran	2016-04-18	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fix Label dropdown and organize code	Alfredo Sumaran	2016-04-15	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/labels_select.js.coffee
\| * \| \| \|	Render proper partial	Alfredo Sumaran	2016-04-15	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Add spaces	Alfredo Sumaran	2016-04-15	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Reuse partial for Create Label page	Alfredo Sumaran	2016-04-15	3	-18/+21
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ci-commit-as-pipeline' into 'master'	Kamil Trzciński	2016-04-21	1	-4/+3
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \ \ \ \	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-16	3	-17/+17
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-13	2	-2/+2
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline	Kamil Trzcinski	2016-04-11	3	-24/+12
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/commits/_commit.html.haml
\| * \| \| \| \| \| \|	Fix specs	Kamil Trzcinski	2016-04-11	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use Ci::Commit as Pipeline	Kamil Trzcinski	2016-04-11	1	-4/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove duplicate hidden_field and fix Rubocop	Rémy Coutable	2016-04-20	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Address MR feedback	Rémy Coutable	2016-04-20	2	-16/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Removed buttons instead clicking date sets it	Phil Hughes	2016-04-20	1	-6/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with dropdown not being toggleable again
* \| \| \| \| \| \| \|	Mobile value color for due date	Phil Hughes	2016-04-20	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Updates sidebar value	Phil Hughes	2016-04-20	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Posts the due date through AJAX	Phil Hughes	2016-04-20	1	-13/+26
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Removed due date filter	Phil Hughes	2016-04-20	1	-6/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix functionality of due this week. Add due this month and overdue, remove ↵	Mehmet Beydogan	2016-04-20	3	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	due tomorrow to issues. Fix typos on sorting dropdown related to due date Remove constant array and add Structs on Issue to keep due date data to fill options
* \| \| \| \| \| \| \|	Add due_date:time field to Issue model	Mehmet Beydogan	2016-04-20	3	-0/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-12/+18
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mutliple label filter Fixes #989 See merge request !3438
\| * \| \| \| \| \| \|	Fixed tests because of nil array	Phil Hughes	2016-04-20	1	-3/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Label text color comes from JSON	Phil Hughes	2016-04-20	1	-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	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	characters in the templates to prevent xss attack
\| * \| \| \| \| \| \|	Removed animation from labels filter	Phil Hughes	2016-04-20	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	some refactoring	Arinde Eniola	2016-04-19	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix failing tests	Arinde Eniola	2016-04-15	1	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix failing tests	Arinde Eniola	2016-04-14	3	-4/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix issue with labels not showing initially.	Jacob Schatz	2016-04-13	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Removes dup dropdown	Jacob Schatz	2016-04-13	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Filter by multiple labels with little animation.	Jacob Schatz	2016-04-13	3	-9/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Proper selecting multiple labels.	Jacob Schatz	2016-04-13	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Initial mutli label filter	Jacob Schatz	2016-04-13	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fixed issue with new MR form layout	Phil Hughes	2016-04-20	1	-8/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	add slack notifications for wiki pages	Sebastian Klier	2016-04-20	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update changelog
* \| \| \| \| \| \| \|	Fix javascript errors with invalid json because of commas	Felipe Artur	2016-04-19	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rs-issue-15126' into 'master'	Douwe Maan	2016-04-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove persistent XSS vulnerability in `commit_person_link` helper Because we were incorrectly supplying the tooltip title as `data-original-title` (which Bootstrap's Tooltip JS automatically applies based on the `title` attribute; we should never be setting it directly), the value was being passed through as-is. Instead, we should be supplying the normal `title` attribute and letting Rails escape the value, which also negates the need for us to call `sanitize` on it. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126 See merge request !1948
\| * \| \| \| \| \| \|	Remove additional misuse of `data-original-title` attribute	Robert Speicher	2016-04-18	1	-1/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Trigger filtering after ajax is complete in dropdowndropdown-filter-after-load	Phil Hughes	2016-04-19	1	-0/+1
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15186