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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| * \| \| \|	refactored migration and spec based on feedback	James Lopez	2016-02-04	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue	James Lopez	2016-02-02	4	-15/+53
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue	James Lopez	2016-02-01	13	-113/+173
\| \|\ \ \ \ \
\| * \| \| \| \| \|	refactor previous test and add validation to project model	James Lopez	2016-01-29	1	-6/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue	James Lopez	2016-01-29	26	-137/+575
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	WIP - spec failure on .atom project URL	James Lopez	2016-01-22	1	-0/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/rs-database-info'	Dmitriy Zaporozhets	2016-02-04	1	-0/+20
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Display database type and version in Administration dashboardrs-database-info	Robert Speicher	2016-02-02	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12900
* \| \| \| \| \| \| \|	Merge branch 'disable-remove-source-branch' into 'master'	Douwe Maan	2016-02-04	1	-1/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide remove source branch button when new commit is added to branch Fixes #3339 This MR hides the 'Remove source branch' button when a new commit is added to the source branch /cc @DouweM See merge request !2701
\| * \| \| \| \| \| \| \|	Hide remove source branch button when new commit is added to branch	Zeger-Jan van de Weg	2016-02-04	1	-1/+7
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3339 This MR hides the 'Remove source branch' button when a new commit is added to the source branch
* \| \| \| \| \| \| \|	Merge branch 'rs-whitelist-in-pipeline' into 'master'	Douwe Maan	2016-02-04	2	-22/+37
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Pipelines responsible for defining their custom whitelist This allows for future pipelines to more easily define a custom whitelist. See merge request !2693
\| * \| \| \| \| \| \| \|	Make Pipelines responsible for defining their custom whitelistrs-whitelist-in-pipeline	Robert Speicher	2016-02-03	2	-22/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows for future pipelines to more easily define a custom whitelist.
* \| \| \| \| \| \| \| \|	Merge branch 'wipMergeSpacing' into 'master'	Douwe Maan	2016-02-04	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No space required after WIP identifier Fixes #2426 Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging. To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap"). See merge request !1876
\| * \| \| \| \| \| \| \|	Removed redundent and incorrect tests on WIP	Ted Hogan	2016-01-06	1	-10/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into wipMergeSpacing	Ted Hogan	2015-12-29	330	-4654/+7180
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	No space required after WIP identifier	Ted Hogan	2015-11-23	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modified changelog
* \| \| \| \| \| \| \| \| \|	Fix testsuse-top-area	Dmitriy Zaporozhets	2016-02-03	1	-4/+4
\| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>