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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix undefined method `postgresql?` during migrationrs-gitlab-database-module	Robert Speicher	2016-02-15	1	-0/+32
\|
*	Merge branch 'fix/ci-emails-broken-link' into 'master'	Douwe Maan	2016-02-13	4	-271/+291
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| *	Fix broken link in CI build notification emails	Grzegorz Bizon	2016-02-12	1	-38/+40
\| \| \| \| \| \| \| \|	Closes #13199
* \|	Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docs	Ben Boeckel	2016-02-12	2	-16/+4
\|/ \| \| \| \| \| \| \|	- 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 'streamline-email-validation' into 'master'	Douwe Maan	2016-02-12	5	-30/+82
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Validate email addresses using Devise.email_regexp	Rémy Coutable	2016-02-09	5	-30/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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
\| \| \|
* \| \|	Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' ↵	Rémy Coutable	2016-02-11	1	-0/+22
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-18/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API specs
\| * \| \|	Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' ↵	Gal Schlezinger	2016-02-11	2	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'brammeleman/3047-add-assignee-data-to-isuable-hook-data' into ↵	Robert Speicher	2016-02-10	1	-0/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add assignee data to Issuables' hook_data Originally opened at !1633 by @brammeleman. Fixes #3047. Fixes #2475. See merge request !2724
\| * \| \| \|	Add assignee data to Issuables' hook_databrammeleman/3047-add-assignee-data-to-isuable-hook-data	Bram Daams	2016-02-10	1	-0/+10
\| \| \| \| \|
* \| \| \| \|	Merge branch 'cwq1913/gitlab-ce-fix_skip_merge_commits' into 'master'	Robert Speicher	2016-02-10	1	-0/+6
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Actually use the `skip_merges` option in Repository#commits Originally opened at !2067 by @cwq1913. See merge request !2750
\| * \| \| \|	Actually use the `skip_merges` option in Repository#commitscwq1913/gitlab-ce-fix_skip_merge_commits	Tony Chu	2016-02-08	1	-0/+6
\| \|/ / /
* \| \| \|	Merge branch 'smarter-diverging-commit-cache-flushing' into 'master'	Douwe Maan	2016-02-09	2	-3/+37
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Smarter flushing of branch statistics caches This basically ensures we only flush caches of branches whenever we really have to. See commit c514f8b850219cd3e5526e73e1d00e6729e2b466 for the details. cc @joshfng @rspeicher See merge request !2769
\| * \| \| \|	Smarter flushing of branch statistics caches	Yorick Peterse	2016-02-09	2	-3/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of flushing the behind/ahead counts for all branches upon every push we now only flush the cache of branches that actually need to have these statistics recalculated. There are now basically 2 scenarios and their effects: 1. A user pushes a commit to the default branch, this results in the cache being flushed for all branches. 2. A user pushes to a non default branch, this results in _only_ the cache for that branch being flushed. The existing code (Repository#expire_cache) remains backwards compatible with the previous behaviour, the new behaviour is only applied when a branch name is passed as an argument. This ensures that when for example a project is deleted the cache for all branches is flushed.
* \| \| \| \|	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2016-02-09	5	-77/+187
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Merge branch 'ci-permissions' into 'master'	Robert Speicher	2016-02-08	5	-77/+187
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit guest access to builds Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646 See merge request !1942
\| \| * \| \|	Fix commit status tests	Kamil Trzcinski	2016-02-06	1	-18/+30
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' into ci-permissions	Kamil Trzcinski	2016-02-05	5	-26/+51
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| \| * \ \ \	Merge remote-tracking branch 'origin/master' into ci-permissions	Kamil Trzcinski	2016-02-04	15	-31/+278
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/builds/index.html.haml
\| \| * \| \| \| \|	Rename allow_guest_to_access_builds to public_builds	Kamil Trzcinski	2016-02-04	3	-55/+153
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Make the CI permission model simpler	Kamil Trzcinski	2016-02-02	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions.
* \| \| \| \| \| \|	Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master'	Douwe Maan	2016-02-09	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose MergeRequest#merge_status _Originally opened at !2478 by @develop7._ - - - This enables API users to see whether a merge request can be merged without conflicts. See merge request !2756
\| * \| \| \| \| \| \|	Add an API spec for MergeRequest#merge_status and properly document this ↵develop7/add-merge_status-to-merge-request-in-api	Rémy Coutable	2016-02-08	1	-0/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	resource
* \| \| \| \| \| \|	Merge branch 'fix/max-attachment-size-setting-validation'	Douwe Maan	2016-02-09	1	-0/+8
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Validate maximum attachment size in application settings	Grzegorz Bizon	2016-02-09	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`max_attachment_size` in `ApplicationSetting` should be present, only integers greater than zero are valid. Closes #13188
* \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2016-02-09	1	-0/+37
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master' Add option to include the sender name in body of Notify email _Originally opened at !2495 by @huacnlee._ - - - Fixes #7824. See merge request !2767
\| * \| \| \| \| \| \|	Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail	Jason Lee	2016-02-09	1	-0/+37
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project'	Douwe Maan	2016-02-09	1	-0/+14
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Validate uniqueness of milestone title per project	Zeger-Jan van de Weg	2016-02-08	1	-0/+14
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3903
* \| \| \| \| \|	Merge branch 'caching-repository-git-operations' into 'master'	Yorick Peterse	2016-02-09	2	-3/+114
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !2752
\| * \| \| \| \| \|	Cache various Repository Git operationscaching-repository-git-operations	Yorick Peterse	2016-02-08	2	-3/+114
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This caches the output of the following methods: * Repository#empty? * Repository#has_visible_content? * Repository#root_ref The cache for Repository#has_visible_content? is flushed whenever a commit is pushed to a new branch or an existing branch is removed. The cache for Repository#root_ref is only flushed whenever a user changes the default branch of a project. The cache for Repository#empty? is never explicitly flushed as there's no need for it.
* \| \| \| \| \|	Merge branch 'ci/improve-ci-build-api' into 'master'	Kamil Trzciński	2016-02-09	2	-93/+55
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve CI builds API specs This modifies a CI Runners Builds API, to improve performance, and add few missing examples. Extracted from !2560 (cherry-picked + extended). cc @ayufan See merge request !2698
\| * \| \| \| \|	Extract shared context level up in build specsci/improve-ci-build-api	Grzegorz Bizon	2016-02-04	1	-56/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also improve performance of specs by joining some of examples.
\| * \| \| \| \|	Remove unmaintainable db schema comment from build factory	Grzegorz Bizon	2016-02-04	1	-27/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Improve CI API specs related to operations on build	Grzegorz Bizon	2016-02-04	2	-21/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: spec/factories/ci/builds.rb
* \| \| \| \| \|	Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master'	Rémy Coutable	2016-02-08	1	-1/+27
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remember user's inline/tabular diff view preference in a cookie _Originally opened at !1677 by @kkm._ --- As per #3071, some users (we have a local EE installation) prefer 2-column view in diff. In this MR I add an implementation for this feature, using a cookie. Fixes #3071. See merge request !2723
\| * \| \| \| \|	Add spec for assigning view param from cookiekkm/gitlab-ce-user-diff-view-pref-cookie	Robert Speicher	2016-02-05	1	-5/+19
\| \| \| \| \| \|
\| * \| \| \| \|	Add a controller test for the new 'diff_view' cookie	Rémy Coutable	2016-02-05	1	-1/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Project dropdown test span -> i	Phil Hughes	2016-02-05	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Changed the project switcher dropdown toggle	Phil Hughes	2016-02-05	1	-2/+2
\| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214
* \| \| \| \|	Remove project-issuable-filter from admin builds page :)improve-nav-controls	Dmitriy Zaporozhets	2016-02-05	1	-6/+6
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-links	Rémy Coutable	2016-02-04	1	-18/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	You can set type: :merge_request to create a link to merge request lists instead of issues list. Accept both Symbol & String as type argument for the link_to_label helper
* \| \| \|	Merge branch 'fix-test' into 'master'	Dmitriy Zaporozhets	2016-02-04	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @DouweM See merge request !2708
\| * \| \| \|	Fix broken tests	Dmitriy Zaporozhets	2016-02-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'fix/atom-url-issue' into 'master'	Douwe Maan	2016-02-04	1	-0/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix atom url issue on projects This MR adds prevents a project to have a path ending in .atom that conflicts with the feed and Adds a migration to migrate old .atom projects to a different path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2651