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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Updated the allocations Gem to 1.0.4update-allocations	Yorick Peterse	2016-02-15	1	-1/+1
\| \| \| \| \| \|	Sometimes the output of Allocations.to_hash may contain garbage. See https://gitlab.com/gitlab-org/allocations/commit/15d3a39f51392013dcf5f88dd21fab31201350ce for more information.
*	Merge branch 'fix-me-me-me-me' into 'master'	Valery Sizov	2016-02-15	4	-2/+39
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji Steps to reproduce: 1. Go to a MR or issue 2. Click on "thumbsup" Emoji 3 times 3. Observe the tooltip becomes "me, me" Closes #13374, #12788 See merge request !2804
\| *	Add spinach tests for award emojifix-me-me-me-me	Stan Hu	2016-02-13	2	-1/+36
\| \|
\| *	Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji	Stan Hu	2016-02-13	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Steps to reproduce: 1. Go to a MR or issue 2. Click on "thumbsup" Emoji 3 times 3. Observe the tooltip becomes "me, me" Closes #13374, #12788
* \|	Merge branch 'update-omniauth-1-3-1' into 'master'	Robert Speicher	2016-02-13	2	-4/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update omniauth to 1.3.1 for memory performance OmniAuth 1.3.1 may improve memory performance (~ 70% according to [intridea/omniauth!774](https://github.com/intridea/omniauth/pull/774)). Closes #2404. See merge request !2805
\| * \|	Update omniauth to 1.3.1 for memory performance	Takuya Noguchi	2016-02-13	2	-4/+4
\| \| \|
* \| \|	Merge branch 'fix/ci-emails-broken-link' into 'master'	Douwe Maan	2016-02-13	8	-279/+302
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in CI build notification emails Closes #13199 See merge request !2785
\| * \| \|	Move profile notifications specs to separate filefix/ci-emails-broken-link	Grzegorz Bizon	2016-02-12	2	-98/+107
\| \| \| \|
\| * \| \|	Move build emails specs to separate file	Grzegorz Bizon	2016-02-12	3	-177/+186
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also extracts shared examples for notification emails to separate file.
\| * \| \|	Add Changelog entry for links fixes in build emails	Grzegorz Bizon	2016-02-12	1	-0/+1
\| \| \| \|
\| * \| \|	Fix broken link in CI build notification emails	Grzegorz Bizon	2016-02-12	4	-46/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13199
* \| \| \|	Merge branch 'ben.boeckel/gitlab-ce-fixup-links-in-generic-docs' into 'master'	Douwe Maan	2016-02-13	8	-32/+46
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix relative links in other markup formats _Originally opened at !1845 by @ben.boeckel._ - - - The RelativeLinkFilter was not applied to other document formats, e.g., reStructuredText, so links from the Files view or the Project view did not work. Fixes #3533. See merge request !2798
\| * \| \|	Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docs	Ben Boeckel	2016-02-12	8	-32/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533.
* \| \| \|	Merge branch 'backup_ci_rm' into 'master'	Achilleas Pipinellis	2016-02-12	1	-2/+0
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove note on backing up GitLab CI as a separate service Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13405 See merge request !2803
\| * \| \|	Remove note on backing up GitLab CI as a separate service	Achilleas Pipinellis	2016-02-13	1	-2/+0
\| \| \|/ \| \|/\| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'fix-duplicate-hook-notifications' into 'master'	Douwe Maan	2016-02-12	3	-10/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicated branch creation/deletion Web hooks/service notifications when using Web UI Similar to 423d2d6, except duplicates occurred only if a Web service (e.g. Slack) were configured. When deleting a branch, this is what was happening: 1. DeleteBranchService calls execute_hooks and execute_services 2. The call to repository.rm_branch triggers the GitHooksService. 3. This, in turn, calls GitPushService and then calls the same hooks/services again. 5145706 now makes it no longer necessary for DeleteBranchService and CreateBranchService to execute the branch hooks/services. Note that tags behave differently in GitTagPushService and GitPushService is not called. Closes #10330 See merge request !2763
\| * \| \|	Fix duplicated branch creation/deletion Web hooks/service notifications when ↵	Stan Hu	2016-02-09	3	-10/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	using Web UI Similar to 423d2d6, except duplicates occurred only if a Web service (e.g. Slack) were configured. When deleting a branch, this is what was happening: 1. DeleteBranchService calls execute_hooks and execute_services 2. The call to repository.rm_branch triggers the GitHooksService. 3. This, in turn, calls GitPushService and then calls the same hooks/services again. 5145706 now makes it no longer necessary for DeleteBranchService and CreateBranchService to execute the branch hooks/services. Note that tags behave differently in GitTagPushService and GitPushService is not called. Closes #10330
* \| \| \|	Merge branch 'fix_500-commit-null' into 'master'	Douwe Maan	2016-02-12	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't try to mark broken MR as mergable In case merge request is broken, we shouldn't check if the sha is mergable, as it will be null, and there's no point, as we know that it's not mergable. See merge request !2783
\| * \| \| \|	Don't try to mark broken MR as mergable	Nemanja Boric	2016-02-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In case merge request is broken, we shouldn't check if the sha is mergable, as it will be null, and there's no point, as we know that it's not mergable.
* \| \| \| \|	Merge branch 'rs-issue-merge-requests' into 'master'	Douwe Maan	2016-02-12	1	-3/+3
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct indentation for `issues/merge_requests` partial render Prior, it would only be shown if the issue had been edited. See merge request !2789
\| * \| \| \|	Correct indentation for `issues/merge_requests` partial renderrs-issue-merge-requests	Robert Speicher	2016-02-11	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, it would only be shown if the issue had been edited.
* \| \| \| \|	Merge branch 'rs-loosen-nokogiri' into 'master'	Dmitriy Zaporozhets	2016-02-12	2	-2/+2
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Loosen Nokogiri version requirement Closes #13218 See merge request !2791
\| * \| \| \|	Loosen Nokogiri version requirementrs-loosen-nokogiri	Robert Speicher	2016-02-11	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13218
* \| \| \| \|	Merge branch 'workhorse-0.6.4' into 'master'	Rémy Coutable	2016-02-12	3	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-workhorse 0.6.4 This fixes a bug in 8.5.0.rc1 where downloading Git blobs through the API is broken. See merge request !2794
\| * \| \| \| \|	Use gitlab-workhorse 0.6.4workhorse-0.6.4	Jacob Vosmaer	2016-02-12	3	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 're-add-update-configuration-files-in-latest-upgrade-guide' ↵	Rémy Coutable	2016-02-12	1	-2/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Re-add "Update configuration files" section in the 8.4 to 8.5 upgrade guide Needed because of !2782. See merge request !2796
\| * \| \| \| \| \|	Re-add "Update configuration files" section in the 8.4 to 8.5 upgrade guide	Rémy Coutable	2016-02-12	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Needed because of !2782. [ci skip]
* \| \| \| \| \| \|	Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master'	Douwe Maan	2016-02-12	4	-12/+10
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix milestone order in project and issue edit lists to due_date _Originally opened at !2579 by @olirogers._ - - - This MR orders the milestones by due date (earliest first) in the project and edit issue view. These suggestions were made be @orih in #6001 and fixes #6001. This continues the work of !1934 to order milestones. I found this annoying when creating milestones, found #6001 but no attached MR. This is my first for this project - comments and criticisms welcome. See merge request !2780
\| * \| \| \| \| \|	Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-order	Oliver Rogers	2016-02-10	4	-12/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'typo_api_builds_doc' into 'master'	Achilleas Pipinellis	2016-02-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in doc/api/builds.md See merge request !2795
\| * \| \| \| \| \| \|	Fix typo in doc/api/builds.md	Achilleas Pipinellis	2016-02-12	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'streamline-email-validation' into 'master'	Douwe Maan	2016-02-12	11	-53/+89
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate email addresses using Devise.email_regexp Also: - Get rid of legacy `:strict_mode` - Get rid of custom `:email` validator - Add some shared examples to spec emails validation This supersedes !2754 and fixes #3851. See merge request !2771
\| * \| \| \| \| \|	Re-add EmailValidator to avoid the repetition of format: { with: ↵streamline-email-validation	Rémy Coutable	2016-02-09	5	-6/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Devise.email_regexp }
\| * \| \| \| \| \|	Validate email addresses using Devise.email_regexp	Rémy Coutable	2016-02-09	11	-58/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also: - Get rid of legacy :strict_mode - Get rid of custom :email validator - Add some shared examples to spec emails validation
* \| \| \| \| \| \|	Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into ↵	Douwe Maan	2016-02-12	4	-5/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' API: Allow to set or update a merge-request's milestone _Originally opened at !2107 by @ skakirill._ - - - See merge request !2755
\| * \| \| \| \| \| \|	Add a spec for setting/updating a MR's milestone via the APIskakirill/gitlab-ce-api-merge-request-setup-milestone	Rémy Coutable	2016-02-09	1	-3/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	API: Allow to set or update a merge-request's milestone	Kirill Skachkov	2016-02-08	3	-2/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'issue_13369' into 'master'	Robert Speicher	2016-02-12	1	-8/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't show fork button if user can't fork the project. Fixes #13369 See merge request !2793
\| * \| \| \| \| \| \| \|	Don't show fork button if user can't fork the project.issue_13369	Rubén Dávila	2016-02-11	1	-8/+9
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'issue_13365' into 'master'	Robert Speicher	2016-02-12	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load all blob data when highlighting content for git-blame. Fixes #13365 See merge request !2792
\| * \| \| \| \| \| \|	Load all blob data when highlighting content for git-blame.	Rubén Dávila	2016-02-11	1	-0/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fix_markdown_image_link' into 'master'	Achilleas Pipinellis	2016-02-11	2	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a new image in the markdown help page Previously we were linking directly from the public/ directory. While this worked for the GitLab help page, it was not working for doc.gitlab.com. Adding an image in a relative directory and linking from there serves both ends. Fixes #13233 See merge request !2790
\| * \| \| \| \| \| \|	Add a new image in the markdown help page	Achilleas Pipinellis	2016-02-11	2	-4/+4
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously we were linking directly from the public/ directory. While this worked for the GitLab help page, it was not working for doc.gitlab.com. Adding an image in a relative directory and linking from there serves both ends. [ci skip]
* \| \| \| \| \| \|	Merge branch 'remove_sqlite_check' into 'master'	Jeroen van Baarsen	2016-02-11	1	-18/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove sqlite check in raketask This is a relic from 4 major releases ago. Time to remove it. See merge request !2777
\| * \| \| \| \| \| \|	Remove sqlite check in raketaskremove_sqlite_check	Achilleas Pipinellis	2016-02-10	1	-18/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Achilleas Pipinellis	2016-02-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed "Docker Fundamentals" link in GitLab Documentation. I noticed that the Docker Fundamentals link in the Using Docker Images part of the GitLab Documentation is broken. Screenshot: ![broken-link](/uploads/8d2fc782b2f5d4f3316a631f801cd3c7/broken-link.png) Changing it to "https://docs.docker.com/" should fix the problem. See merge request !2786
\| * \| \| \| \| \| \| \|	Updated Docker Fundamentals link as suggested by @axil	Denis Meiswinkel	2016-02-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed "Docker Fundamentals" link.	Denis Meiswinkel	2016-02-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' ↵	Rémy Coutable	2016-02-11	4	-0/+98
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add merge_requests/:merge_request_id/closes_issues _Originally opened at !2660 by @Schniz._ - - - Added `/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues` route in the API for getting the issues that should be closed when a merge request merged successfully See merge request !2779
\| * \| \| \| \| \| \| \|	Pass current_user to merge_request.closes_issues in API ans streamline MR ↵Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api	Rémy Coutable	2016-02-11	3	-19/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API specs