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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Check public snippets for spam	Sean McGivern	2017-02-02	2	-2/+2
\| \| \| \| \| \|	Apply the same spam checks to public snippets (either personal snippets that are public, or public snippets on public projects) as to issues on public projects.
*	Merge branch 'fix/import-user-validation-error' into 'master'	Rémy Coutable	2017-02-02	1	-0/+2
\| \| \| \| \| \| \|	Fix user validation error in Import/Export Closes #23833 See merge request !8909
*	Merge branch 'zj-slow-service-fetch' into 'master'	Yorick Peterse	2017-01-31	1	-3/+10
\| \| \| \| \|	Improve performance of triggered chat commands See merge request !8876
*	Merge branch 'refresh-authorizations-fork-join' into 'master'	Douwe Maan	2017-01-27	4	-0/+116
\| \| \| \| \| \| \|	Fix race conditions for AuthorizedProjectsWorker Closes #26194 and #26310 See merge request !8701
*	Merge branch 'fix-ci-requests-concurrency' into 'master'	Grzegorz Bizon	2017-01-25	1	-9/+16
\| \| \| \| \|	Fix CI requests concurrency See merge request !8760
*	Merge branch 'backport-ee-changes-for-build-minutes' into 'master'	Grzegorz Bizon	2017-01-25	2	-1/+2
\| \| \| \| \|	Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1078 See merge request !8657
*	Merge branch 'fix-guest-access-posting-to-notes' into 'security'	Robert Speicher	2017-01-22	1	-10/+16
\| \| \| \| \|	Prevent users from creating notes on resources they can't access See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2054
*	Merge branch 'fix-api-mr-permissions' into 'security'	Robert Speicher	2017-01-22	5	-24/+21
\| \| \| \| \| \|	Ensure that only privileged users can access merge requests in the API See merge request !2053
*	Merge branch 'fix-users-deleting-public-deployment-keys' into 'security'	Robert Speicher	2017-01-22	1	-3/+7
\| \| \| \| \|	Fix users being able to delete instance public deployment keys See merge request !2049
*	Merge branch 'fix/import-users' into 'master'	Rémy Coutable	2017-01-20	2	-14/+6
\| \| \| \| \| \| \|	Fix import no longer mapping users as admin Closes #25346 See merge request !8625
*	Merge branch '21698-redis-runner-last-build' into 'master'	Kamil Trzciński	2017-01-20	2	-1/+10
\| \| \| \| \|	Reduce DB-load for build-queues by storing last_update in Redis See merge request !8084
*	Merge branch 'feature/gitaly-feature-flag' into 'master'	Robert Speicher	2017-01-20	1	-1/+8
\| \| \| \| \|	Gitaly feature flag See merge request !8440
*	Merge branch 'fix/external-status-badge-links' into 'master'	Kamil Trzciński	2017-01-20	3	-0/+37
\| \| \| \| \| \| \|	Link external commit status badges to target URLs Closes #25662 See merge request !8611
*	Merge branch 'fix/refactor-cycle-analytics-stages' into 'master'	Douwe Maan	2017-01-19	31	-210/+439
\| \| \| \| \|	Refactor cycle analytics stages (1st iteration) See merge request !7647
*	Merge branch 'time-tracking-api' into 'master'	Sean McGivern	2017-01-19	6	-11/+144
\| \| \| \| \| \| \|	Time tracking API Closes #25861 See merge request !8483
*	Merge branch 'rs-data_attribute-cleanup' into 'master'	Douwe Maan	2017-01-19	1	-3/+5
\| \| \| \| \|	Correct documentation for `data_attribute` method See merge request !8603
*	Merge branch 'backport-time-tracking-ce' into 'master'	Douwe Maan	2017-01-19	2	-0/+32
\| \| \| \| \|	Backport timetracking to CE See merge request !8195
*	Merge branch '26756-fix-already-intialized-constant-warnings' into 'master'	Robert Speicher	2017-01-19	3	-7/+0
\| \| \| \| \| \| \|	Remove some useless require_relative statements Closes #26756 See merge request !8609
*	Merge branch '19633-remove-rerun' into 'master'	Robert Speicher	2017-01-19	1	-5/+0
\| \| \| \| \| \| \|	Remove rerun since it's not used anymore Closes #19633 See merge request !8598
*	Merge branch 'sandish/gitlab-ce-update_ret_val' into 'master'	Robert Speicher	2017-01-19	1	-4/+4
\| \| \| \| \|	Ensure updating project settings shows a flash message on success See merge request !8579
*	Merge branch 'fix-deprecation-warning' into 'master'	Rémy Coutable	2017-01-16	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Fix a API deprecation warning See merge request !8587
\| *	Fix a API deprecation warningfix-deprecation-warning	Robert Schilling	2017-01-16	1	-1/+1
\| \|
* \|	Merge branch 'dot-in-project-queries' into 'master'	Rémy Coutable	2017-01-16	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add a constraint on the query parameter to allow querying for projects with dots in their name. See merge request !8210
\| * \|	Add a constraint on the query parameter to allow querying for projects with ↵	Bruno Melli	2017-01-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	dots in their name.
* \| \|	Allow to use + symbol in filenames	blackst0ne	2017-01-15	1	-2/+2
\| \| \|
* \| \|	Merge branch ↵	Douwe Maan	2017-01-14	1	-2/+2
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-exist' into 'master' Resolve "`Gitlab::Checks::ChangeAccess` looks for user permissions that don't exist" Closes #25018 See merge request !8551
\| * \|	Remove useless permission checks in Gitlab::Checks::ChangeAccess25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-exist	Rémy Coutable	2017-01-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch '26587-metrics-middleware-endpoint-is-nil' into 'master'	Yorick Peterse	2017-01-14	1	-4/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Metrics middleware: endpoint is nil" Closes #26587 See merge request !8544
\| * \| \|	Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route26587-metrics-middleware-endpoint-is-nil	Rémy Coutable	2017-01-12	1	-4/+11
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`endpoint.route` is calling `env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info]` but `env[Grape::Env::GRAPE_ROUTING_ARGS]` is `nil` in the case of a 405 response Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'env-var-in-redis-config' into 'master'	Rémy Coutable	2017-01-13	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to use ENV variables in redis config See merge request !8073
\| * \| \|	Allow to use ENV variables in redis config	Semyon Pupkov	2017-01-13	1	-1/+1
\| \|/ /
* \| \|	API: Implement project issues iid param with IssuesFinder and add tests23194-fix-no-milestone-option-for-projects-endpoint	David Eisner	2017-01-12	1	-21/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Use IssuesFinder for the /issues API resouce - Tests for iid filter in project issues API resource - Tests for No Milestone filter in issues API resources The "No Milestone" case was not previously tested, and the `/issues` resource did not support the the `milestone` parameter. - Return issues where all labels match from the issues and project issues API resources, like the group issues resource already does. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6825#note_17474533 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Adding 'IssueFinder' for 'projects' API endpoint	Panagiotis Atmatzidis	2017-01-12	1	-6/+8
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Current filtering for "/projects/:id/issues" endpoint returns no results for "No Milestone" query. This PR introduces fix by copying filtering from "/groups/:id/issues" which works as expected.
* \|	Merge branch 'use-configured-git' into 'master'	Douwe Maan	2017-01-12	3	-8/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use configured git rather thans system git See merge request !8460
\| * \|	Use configured git rather than system gituse-configured-git	Robert Schilling	2017-01-05	3	-8/+8
\| \| \|
* \| \|	Merge branch 'zj-unadressable-url-variables' into 'master'	Douwe Maan	2017-01-12	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not check for valid url for .gitlab-ci.yml Closes #22970 See merge request !8451
\| * \| \|	Do not check for valid url for .gitlab-ci.yml	Z.J. van de Weg	2017-01-05	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Until this commit, GitLab would check if the URL in your .gitlab-ci.yml would be valid and adressable. However, this approach is rather limited. To begin, the URL couldn't be http://example:$PORT/my-project, as the PORT value would be interpolated after checking if the URL was valid, which its not. Also this gem will limit the amount of protocols allowed. This commit doesn't check, at all, if the URL is valid. This is now the responsablilty of the user. In my opion this is right, as the user ultimately benefits from a correct URL, but also, its impossible to cover all cases.
* \| \| \|	Merge branch 'search-bar-first-iteration' into 'master'	Jacob Schatz	2017-01-12	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Search bar first iteration Closes #21747 See merge request !7345
\| * \| \| \|	Add username to gon	Clement Ho	2017-01-09	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'Sanson/gitlab-ce-asciidoctor-plantuml' into 'master' 20450-retry-build-button	Sean McGivern	2017-01-12	4	-1/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for PlantUML diagrams in Asciidoc. Closes #17603 See merge request !8537
\| * \| \| \| \|	Add support for PlantUML diagrams in Asciidoc.	Horacio Sanson	2017-01-12	4	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a PlantUML diagram all we need is to include a plantuml block like: ``` [plantuml, id="myDiagram", width="100px", height="100px"] -- bob -> alice : ping alice -> bob : pong -- ``` The plantuml block is substituted by an HTML img element with src pointing to an external PlantUML server. This MR also add a PlantUML integration section to the Administrator -> Settings page to configure the PlantUML rendering service and to enable/disable it. Closes: #17603
* \| \| \| \| \|	Merge branch 'do-not-remove-autodeploy-directory-when-fetching-ci-templates' ↵	Sean McGivern	2017-01-12	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Do not remove "autodeploy" directory when fetching CI templates See merge request !8517
\| * \| \| \| \|	Do not remove "autodeploy" directory when fetching CI templatesdo-not-remove-autodeploy-directory-when-fetching-ci-templates	Adam Niedzielski	2017-01-10	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Fix Users API to accept confirm parameter	Mark Fletcher	2017-01-11	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Fix Rubocop offenses in LDAP related code and spec	Grzegorz Bizon	2017-01-10	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'restore-backup-when-env-variable-is-passed' into 'master'	Sean McGivern	2017-01-10	1	-17/+27
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore backup correctly when "BACKUP" environment variable is passed Closes #26090 See merge request !8477
\| * \| \| \|	Restore backup correctly when "BACKUP" environment variable is passedrestore-backup-when-env-variable-is-passed	Adam Niedzielski	2017-01-09	1	-17/+27
\| \| \| \| \|
* \| \| \| \|	Merge branch 'auto-pipelines-vue' into 'master'	Fatih Acet	2017-01-09	2	-38/+46
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pipelines Vue See merge request !7196
\| * \ \ \ \	Merge branch 'master' into auto-pipelines-vue	Regis	2017-01-09	10	-23/+70
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into auto-pipelines-vue	Filipa Lacerda	2017-01-05	21	-4/+2960
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (35 commits) Adds back removed class in merge request pipelines table Fix dropdown icon alignment Simplify HTML of mini pipeline graph and dropdown Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups Adds CHANGELOG entry Removes unneeded `window` declaration Decreases font-size on login page Ensure internal Gitlab::Git references use the namespace Absorb gitlab_git Fix review comments. Add spec for note edit and fix one commented spec. Review fixes. Use gl.utils.isInViewport and improve gl.utils.animateToElement. Make sure elements share the same scope Hide edit warning element when form reverted. Remove unnecessary styling came from merge conflicts. Fix single note edit form specs. Separate edit form in Changes and Discussions tab. Fix warning styling for responsive design. Fix task list for single edit note widget changes. Fix notes spec. ...