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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix specssend-incremental-build-log	Kamil Trzcinski	2016-05-12	1	-1/+1
\|
*	Merge remote-tracking branch 'origin/master' into send-incremental-build-log	Kamil Trzcinski	2016-05-10	190	-2902/+839
\|\
\| *	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
\| \| \|
\| * \|	Merge branch 'fix/remove-broken-inline-runner-desc-edit' into 'master'	Robert Speicher	2016-05-10	2	-38/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove broken inline runner description edit form This remove inline form for editing runnner's description. It is broken because of missing partial / incorrect response and it also does not make much sense, since we have under 'Edit' button a form that makes it possible to edit more than just a description. See merge request !4095
\| \| * \|	Use abbrevation in runners table in admin area	Grzegorz Bizon	2016-05-10	1	-1/+1
\| \| \| \|
\| \| * \|	Remove broken inline runner description edit form	Grzegorz Bizon	2016-05-09	2	-38/+2
\| \| \| \|
\| * \| \|	Merge branch 'fix/using-uploads-in-global-snippets' into 'master'	Robert Speicher	2016-05-10	3	-1/+26
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix using link to uploads in global snippets Closes #17342, closes #17363 See merge request !4085
\| \| * \| \|	Do not process upload links if no project context	Grzegorz Bizon	2016-05-10	2	-5/+9
\| \| \| \| \|
\| \| * \| \|	Add Changelog entry for upload link in snippet fix	Grzegorz Bizon	2016-05-10	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Fix using link to uploads in global snippets	Grzegorz Bizon	2016-05-10	2	-1/+21
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Closes #17342, closes #17363
\| * \| \|	Change dashboard button color to white on hover	Dmitriy Zaporozhets	2016-05-10	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Minor consistency fixes to sidebar & header	Dmitriy Zaporozhets	2016-05-10	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Merge branch 'mobile-navigation-redesign' into 'master'	Dmitriy Zaporozhets	2016-05-10	8	-9/+108
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide navbar on mobile Part of #14838 Closes #17323 <img src="/uploads/33d2dbc17e94329891108c4e80d4aff3/nav.gif" width="800px"> See merge request !4103
\| \| * \| \|	Fix media queries for absolutely positioned nav element	Annabel Dunstone	2016-05-09	3	-4/+14
\| \| \| \| \|
\| \| * \| \|	Hide navbar on mobile	Annabel Dunstone	2016-05-09	7	-6/+95
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-05-10	145	-2734/+232
\| \|\ \ \ \
\| \| * \ \ \	Merge branch '2460-3690-support-multiline-tag-message' into 'master'	Rémy Coutable	2016-05-10	9	-142/+223
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support multi-line tag messages _Originally opened at !2853 by @clns._ - - - Tag messages in Git can include a short summary of what changes are included in a release and any other relevant information. So I think GitLab should support multi-line tag messages, both in the "New Tag" interface and when viewing the tag. Also a non-technical user could use GitLab's interface to create releases, but at the moment this is impossible because he cannot enter a multi-line message. This would've been very handy, otherwise he would need to do it from the command line or other GUI program, which is not something a non-technical user has access to or knows how to do. This merge request adds support for multi-line tag messages. Below are the impacted screens. Let me know if I should change anything. This would close #3690 and #2460 ![image](/uploads/d33bede1141bfb10c5d9c301ee1cb0ec/image.png) ![image](/uploads/ebfea358c1a5986e7b95ad31748f7a6a/image.png) See merge request !3833
\| \| \| * \| \| \|	Add integration specs for tags	Rémy Coutable	2016-05-10	8	-137/+219
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| \| * \| \| \|	Replace text field with textarea in 'New Tag' view and display tag message ↵	Calin Seciu	2016-05-10	2	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in `<pre>`
\| \| * \| \| \| \|	Merge branch 'revert-4026' into 'master'	Rémy Coutable	2016-05-10	5	-7/+4
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'wiki-fix' into 'master'" This reverts commit 4cc85a58e8ca00f5a4ecbd2bca40a0cad867b817 (!4026), reversing changes made to 90ae445ba930068d04adc5a009dbdeabe4cb3e34. From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4026#note_11719950: > 1. On Ruby 2.1.x, the [`uri.path = ::File.join(project_wiki_base_path, uri.path)`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/banzai/filter/wiki_link_filter.rb#L39) raises an `URI::InvalidComponentError: bad component(expected relative path component): http://bar.com/baz` error in `Banzai::Filter::WikiLinkFilter#rebuild_wiki_uri`, which is then rescued in [`Banzai::Filter::WikiLinkFilter#process_link_attr`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/banzai/filter/wiki_link_filter.rb#L34), thus the link is not modified and the tests pass. 1. On Ruby 2.2.x, the same line doesn't raise an error anymore, thus tests are broken on Ruby 2.2 only. I didn't really understand yet why having absolute links in the wiki would break some tests vs having relative links as before, but I think the safest course to action is to revert this MR and to find another fix (probably just prepending `ProjectWiki#wiki_base_path` with the relative URL path component if we are in the case of a relative URL... /cc @artem-sidorenko Just a FYI note: no need to pick into `8-7-stable` since the original commit was not picked. See merge request !4105
\| \| \| * \| \| \|	Revert "Merge branch 'wiki-fix' into 'master' "	Rémy Coutable	2016-05-10	5	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4cc85a58e8ca00f5a4ecbd2bca40a0cad867b817, reversing changes made to 90ae445ba930068d04adc5a009dbdeabe4cb3e34. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \| \|	Merge branch 'remove-annotate-gem' into 'master'	Yorick Peterse	2016-05-10	131	-2585/+1
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the annotate gem and delete old annotations In 8278b763d96ef10c6494409b18b7eb541463af29 the default behaviour of annotation has changes, which was causing a lot of noise in diffs. We decided in #17382 that it is better to get rid of the whole annotate gem, and instead let people look at schema.rb for the columns in a table. Fixes: #17382 /cc @yorickpeterse See merge request !4099
\| \| \| * \| \| \|	Remove the annotate rake task	Jeroen van Baarsen	2016-05-10	1	-44/+0
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Remove the annotate gem and delete old annotations	Jeroen van Baarsen	2016-05-09	130	-2541/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In 8278b763d96ef10c6494409b18b7eb541463af29 the default behaviour of annotation has changes, which was causing a lot of noise in diffs. We decided in #17382 that it is better to get rid of the whole annotate gem, and instead let people look at schema.rb for the columns in a table. Fixes: #17382
\| \| * \| \| \| \|	Merge branch 'fix-link-to-redmine-issues' into 'master'	Robert Speicher	2016-05-10	2	-0/+4
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow Redmine issue references to work as intended Closes #14527 and #14894 See merge request !4048
\| \| \| * \| \| \| \|	Links for redmine issue references are generated correctly again	Benedikt Huss	2016-05-10	2	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'xss-case-insensitive-protocol' into 'master'	Robert Speicher	2016-05-09	3	-1/+8
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a case-insensitive check to compare URI schemes Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17299 See merge request !1965
\| \| * \| \| \| \| \|	Use a case-insensitive comparison in sanitizing URI schemes	Stan Hu	2016-05-09	3	-1/+8
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1625
\| * \| \| \| \| \|	Merge branch 'revert-450ea01d' into 'master'	Achilleas Pipinellis	2016-05-09	1	-5/+5
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'patch-1' into 'master'" This reverts merge request !4030. /cc @stanhu @axil @aral See merge request !4097
\| \| * \| \| \| \|	Revert "Merge branch 'patch-1' into 'master'"	Rémy Coutable	2016-05-09	1	-5/+5
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !4030
\| * \| \| \| \|	Merge branch 'fix/todos-for-private-group-mentions' into 'master'	Douwe Maan	2016-05-09	3	-2/+22
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix adding a todo for private group memebers See merge request !4081
\| \| * \| \| \| \|	Fix adding a todo for private group members	Ahmad Sherif	2016-05-07	3	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #14002
\| * \| \| \| \| \|	Merge branch 'cascade_drop' into 'master'	Robert Speicher	2016-05-09	1	-1/+3
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add if exists to drop command Add `IF EXISTS` as a precaution. Related to gitlab-org/gitlab-ce!4020 See merge request !4100
\| \| * \| \| \| \| \|	Add if exists to drop command	Drew Blessing	2016-05-09	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'issue_15394' into 'master'	Rémy Coutable	2016-05-09	6	-1/+26
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize milestones and labels titles fixes #15394 See merge request !4046
\| \| * \| \| \| \| \|	Make model sanitization methods one liners	Felipe Artur	2016-05-09	3	-6/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Sanitize milestones and label titlesissue_15394	Felipe Artur	2016-05-05	5	-1/+27
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '2954-api-expose-issue-user_notes_count' into 'master'	Rémy Coutable	2016-05-09	9	-34/+89
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Expose Issue#user_notes_count and MergeRequest#user_notes_count _Originally opened at !2954 by @cnam812._ - - - Expose `Issue#user_notes_count` and `MergeRequest#user_notes_count` through the API. See merge request !3126
\| \| * \| \| \| \| \| \|	Expose MergeRequest#user_notes_count in the API and use the method in issues ↵	Rémy Coutable	2016-05-09	7	-45/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	list Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \| \| \| \|	API: Expose Issue#user_notes_count	cnam-dep	2016-05-09	5	-6/+33
\| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'rs-backport-ee-372' into 'master'	Rémy Coutable	2016-05-09	6	-48/+80
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes from gitlab-org/gitlab-ee!372 Mostly replaces several Spinach tests with RSpec Feature tests. See merge request !4043
\| \| * \| \| \| \| \| \|	Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372	Robert Speicher	2016-05-04	6	-48/+80
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mostly replaces several Spinach tests with RSpec Feature tests.
\| * \| \| \| \| \| \|	Merge branch 'fix-secret' into 'master'	Rémy Coutable	2016-05-09	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't read otp_secret_encryption_key from hardcoded path in models/user Variable `Gitlab::Application.config.secret_key_base` is set in config/initializers/secret_token.rb. It's very bad practice to use hard-coded paths inside an application and really unnecessary in this case. Mirror of https://github.com/gitlabhq/gitlabhq/pull/10311 See merge request !4044
\| \| * \| \| \| \| \|	Don't read otp_secret_encryption_key from hardcoded path in models/user	Jakub Jirutka	2016-05-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Variable `Gitlab::Application.config.secret_key_base` is set in config/initializers/secret_token.rb. It's very bad practice to use hard-coded paths inside an application and really unnecessary in this case.
\| * \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-05-09	38	-81/+574
\| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'document-adding-instrumentation' into 'master'	Rémy Coutable	2016-05-09	1	-6/+123
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added documentation on how to instrument methods This will hopefully remove me as a single point of failure when it comes to adding instrumentation. cc @axil @rspeicher See merge request !4035
\| \| \| * \| \| \| \| \|	Added documentation on how to instrument methodsdocument-adding-instrumentation	Yorick Peterse	2016-05-05	1	-6/+123
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \|	Merge branch 'wiki-fix' into 'master'	Rémy Coutable	2016-05-09	5	-4/+7
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the proper GitLab URL for links in Wiki Fixes gitlab-org/gitlab-ce#17071 wiki links are proper compiled, e.g. ``` [same-level](same-level) -> <a href="same-level">same-level</a> [sub-level](sub/level) -> <a href="sub/level">sub-level</a> [upper-level](../upper-level) -> <a href="../upper-level">upper-level</a> ``` See merge request !4026
\| \| \| * \| \| \| \| \| \|	Use the proper GitLab URL for links in Wiki	Artem Sidorenko	2016-05-09	5	-4/+7
\| \| \| \| \| \| \| \| \| \|