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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update fixtures/emojis/index.json	Robert Speicher	2016-02-15	1	-1823/+18276
\| \| \| \|	Current as of Gemojione 2.2.1 - https://git.io/vgQx0
*	Fix specs expecting `emoji/` in image path	Robert Speicher	2016-02-13	2	-3/+3
\|
*	Update Emoji asset path	Robert Speicher	2016-02-12	3	-4/+5
\| \| \| \| \|	Now that we're serving assets directly from the Gemojione gem's path, the images are not in an `emoji/` sub-folder.
*	Update gitlab_emoji to ~> 0.3.0	Robert Speicher	2016-02-12	2	-5/+5
\|
*	Remove unused emoji_autocomplete_source helper	Robert Speicher	2016-02-12	1	-6/+0
\|
*	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
\| * \| \| \| \| \| \|	Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' ↵	Gal Schlezinger	2016-02-11	5	-0/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	route in the API Added some documentation for it Added to changelog Added curl example and an attribute table Moved the api route definition from "lib/api/issues.rb" to "lib/api/merge_requests.rb" Fixed the attributes and changed the documentation to be at "merge_requests.md" too Changed generic titles to more specific titles added an underscore added tests. it depends on a newer version of gitlab-test project I'm doing a since I need to add a branch to the `gitlab-test` repo removed the before using 'iid' instead of 'id' in the description to reference the issues. that makes the tests pass Removed the 'closes-issues' key from test_env. so it should pass the tests Moved the two initializations to the describe block Changed the changelog
* \| \| \| \| \| \| \|	Merge branch 'use-caching' into 'master'	Kamil Trzciński	2016-02-11	2	-6/+52
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use caching This enables to use built-in caching feature instead of using the `/cache` folder. See merge request !2747
\| * \| \| \| \| \| \| \|	Use caching, instead of haxxy /cacheuse-caching	Kamil Trzcinski	2016-02-10	2	-6/+52
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/ci-build-status-badge' into 'master'	Kamil Trzciński	2016-02-11	11	-40/+133
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CI build status badge Closes #5570, #4935, #4163 See merge request !2704
\| * \| \| \| \| \| \|	Parse XML instead of HTML in tests for a SVG build badgefix/ci-build-status-badge	Grzegorz Bizon	2016-02-11	3	-7/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move build badge specs to badges directory	Grzegorz Bizon	2016-02-11	2	-6/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move builds badge implementation to new badges controller	Grzegorz Bizon	2016-02-11	5	-14/+19
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add Changelog entry for changes in builds badge	Grzegorz Bizon	2016-02-11	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Inherit build badge access permissions from project	Grzegorz Bizon	2016-02-11	4	-13/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix rubocop offence in routes for build badge	Grzegorz Bizon	2016-02-11	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add short builds badge documentation	Grzegorz Bizon	2016-02-11	1	-0/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improve build badge tests, add another test case	Grzegorz Bizon	2016-02-11	3	-6/+19
\| \| \| \| \| \| \| \|