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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Syntax & style updates14176-diff-paste-data	Annabel Dunstone	2016-04-14	5	-29/+31
\|
*	Update click_diff_line	Annabel Dunstone	2016-04-14	1	-1/+1
\|
*	Add line type conditional to diff line helper	Annabel Dunstone	2016-04-14	4	-11/+17
\|
*	Add content attributes to discussion diffs; change styling of add-note icon ↵	Annabel Dunstone	2016-04-14	4	-22/+24
\| \| \| \|	to prevent white spaces in paste
*	Copying and pasting doesn't grab line numbers or +/-	Annabel Dunstone	2016-04-14	4	-6/+27
\|
*	Merge branch 'start-with-iid-on-new-branch' into 'master'	Rémy Coutable	2016-04-14	5	-10/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Start with iid on branch creation After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name. See merge request !3708
\| *	Start with iid on branch creation	Zeger-Jan van de Weg	2016-04-14	5	-10/+17
\| \|
* \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2016-04-14	1	-0/+47
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update shibboleth configuration for GitLab 8.6 and Apache 2.4 See merge request !3713
\| * \|	Update shibboleth configuration for GitLab 8.6 and Apache 2.4	Tom Downes	2016-04-14	1	-0/+47
\| \| \|
* \| \|	Merge branch 'toc_gitlab_ci_yml' into 'master'	Achilleas Pipinellis	2016-04-14	1	-16/+57
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add TOC to yaml README and an intro section See merge request !3719
\| * \| \|	Add TOC to yaml README and an intro section	Achilleas Pipinellis	2016-04-14	1	-16/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Added CHANGELOG itemdiff-hash-location	Phil Hughes	2016-04-14	1	-0/+2
\| \| \| \|
* \| \| \|	Fixed issue with other links being clicked in diffs	Phil Hughes	2016-04-14	1	-2/+2
\| \| \| \|
* \| \| \|	Correctly scrolls to the line when clicking	Phil Hughes	2016-04-14	1	-2/+10
\| \| \| \|
* \| \| \|	Diff viewer links to correct part of the file	Phil Hughes	2016-04-14	7	-8/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added highlight colours to diff rows Closes #13852
* \| \| \|	Merge branch 'simplify-gitlab-url_builder-15202' into 'master'	Rémy Coutable	2016-04-14	9	-101/+147
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor and expose only Gitlab::UrlBuilder.build(record) ``` $ git grep Gitlab::UrlBuilder app/models/commit.rb: url: Gitlab::UrlBuilder.build(self), app/services/issues/base_service.rb: issue_url = Gitlab::UrlBuilder.build(issue) app/services/merge_requests/base_service.rb: hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request) app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note) lib/gitlab/note_data_builder.rb: base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note) spec/lib/gitlab/note_data_builder_spec.rb: expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note)) spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do ``` Fixes #15202. See merge request !3696
\| * \| \|	Refactor and expose only Gitlab::UrlBuilder.build(record)simplify-gitlab-url_builder-15202	Rémy Coutable	2016-04-13	9	-101/+147
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'note-form-buttons' into 'master'	Jacob Schatz	2016-04-14	23	-123/+113
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note form A lot of the forms have the same actions associated with them so I have created a standard class that encapsulate these actions. There is also another class that allows toolbar action buttons to be added that will insert different characters based on the HTML `data-prefix` attribute value - this will give us the opportunity to add more actions to the form and maybe create a markdown toolbar in the future. See merge request !3534
\| * \| \| \|	Fixed scss syntax issue	Phil Hughes	2016-04-14	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Focus variable for dropzone	Phil Hughes	2016-04-14	2	-1/+2
\| \| \| \| \|
\| * \| \| \|	Added CHANGELOG item	Phil Hughes	2016-04-14	2	-2/+3
\| \| \| \| \|
\| * \| \| \|	Updated dropzone hover styling	Phil Hughes	2016-04-14	4	-22/+20
\| \| \| \| \|
\| * \| \| \|	Removed GL Actions class	Phil Hughes	2016-04-14	3	-57/+0
\| \| \| \| \|
\| * \| \| \|	Fixed group milestones placeholder bug	Phil Hughes	2016-04-14	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Placeholder on milestone form	Phil Hughes	2016-04-14	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated JS spec to include gl_form
\| * \| \| \|	Updated all GFM forms to use new GLForm class	Phil Hughes	2016-04-14	9	-37/+20
\| \| \| \| \|
\| * \| \| \|	Milestones use new GLForm class	Phil Hughes	2016-04-14	3	-6/+5
\| \| \| \| \|
\| * \| \| \|	merge request form uses new GLForm	Phil Hughes	2016-04-14	3	-3/+3
\| \| \| \| \|
\| * \| \| \|	Updated issue form to use new GLForm	Phil Hughes	2016-04-14	4	-6/+12
\| \| \| \| \|
\| * \| \| \|	Destroy discussion form	Phil Hughes	2016-04-14	2	-8/+22
\| \| \| \| \|
\| * \| \| \|	Notes form JS update	Phil Hughes	2016-04-14	5	-51/+95
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated the JS to have a standard class with standard actions for each form Created ability to have toolbar buttons that insert different prefixes dependant upon the data-prefix attribute
* \| \| \|	Merge branch 'patch-1' into 'master'	Rémy Coutable	2016-04-14	3	-5/+43
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not require recipients when pusher will be recipient Closes #10946 See merge request !3603
\| * \| \| \|	Allow empty recipient list when pusher is added	Frank Groeneveld	2016-04-14	3	-5/+43
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13574
* \| \| \|	Merge branch 'api-issue-update-and-note-create-backdating-14947' into 'master'	Rémy Coutable	2016-04-14	7	-7/+43
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API issue update and note create back dating Closes #14947 See merge request !3551
\| * \| \|	Allow back dating notes on creation	Michael Greene	2016-04-13	4	-0/+20
\| \| \| \|
\| * \| \|	Allow back dating issues on update	Michael Greene	2016-04-13	4	-7/+23
\| \| \| \|
* \| \| \|	Merge branch 'issue_15222' into 'master'	Jacob Schatz	2016-04-13	1	-0/+4
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add test for search page Closes #15222 See merge request !3711
\| * \| \|	Add test to check if top right search form is not presentissue_15222	Alfredo Sumaran	2016-04-13	1	-0/+4
\|/ / /
* \| \|	Merge branch 'redis_config_consistency' into 'master'	Valery Sizov	2016-04-13	3	-5/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redis configuration consistency Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e See merge request !3697
\| * \| \|	Redis configuration consistencyredis_config_consistency	Valery Sizov	2016-04-13	3	-5/+5
\| \| \| \|
* \| \| \|	Merge branch 'issue_14771' into 'master'	Jacob Schatz	2016-04-13	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide top search form on the search page Closes #14771 ![Screen_Shot_2016-04-11_at_6.04.19_PM](/uploads/44cf2110bad29c0df06d874740a3a61f/Screen_Shot_2016-04-11_at_6.04.19_PM.png) See merge request !3668
\| * \| \| \|	Hide top search form on the search pageissue_14771	Alfredo Sumaran	2016-04-11	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'issue_15093' into 'master'	Jacob Schatz	2016-04-13	1	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set tooltips for new added labels Fixes #15093 ![Screen_Shot_2016-04-11_at_5.50.21_PM](/uploads/52d06f6ccb3ca42e7ce75b94111514c2/Screen_Shot_2016-04-11_at_5.50.21_PM.png) See merge request !3667
\| * \| \| \| \|	Set tooltips for new added labelsissue_15093	Alfredo Sumaran	2016-04-11	1	-1/+3
\| \|/ / / /
* \| \| \| \|	Merge branch '14762-delete-button' into 'master'	Jacob Schatz	2016-04-13	1	-4/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update delete button Closes #14762 ![Screen_Shot_2016-04-11_at_5.21.32_PM](/uploads/fef09645eb70fc0fcaee359245664ddc/Screen_Shot_2016-04-11_at_5.21.32_PM.png) See merge request !3665
\| * \| \| \|	Update delete button14762-delete-button	Annabel Dunstone	2016-04-11	1	-4/+2
\| \|/ / /
* \| \| \|	Merge branch 'issuable-form-alignment' into 'master'	Jacob Schatz	2016-04-13	2	-3/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed alignment on issuable new form Fixes #13802 ![Screen_Shot_2016-04-11_at_17.03.29](/uploads/d359580e693284d4b694d8158d4f736e/Screen_Shot_2016-04-11_at_17.03.29.png) See merge request !3661
\| * \| \| \|	Fixed alignment on issuable new formissuable-form-alignment	Phil Hughes	2016-04-11	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #13802
* \| \| \| \|	Merge branch 'update-influx-documentation' into 'master'	Achilleas Pipinellis	2016-04-13	1	-18/+30
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated InfluxDB/Grafana setup/import docs See https://gitlab.com/gitlab-org/grafana-dashboards/merge_requests/1 for some background info. cc @dblessing See merge request !3706
\| * \| \| \| \|	Updated InfluxDB/Grafana setup/import docs	Yorick Peterse	2016-04-13	1	-18/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The grafana-dashboards repository now contains _all_ GitLab.com dashboards and thus requires some extra continuous queries to be set up. The repository now also provided a way to automatically import/export dashboards. [ci skip]