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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'bvl-fix-dynamic-path-query' into 'master'	Douwe Maan	2017-05-12	1	-1/+1
\| \| \| \| \|	Only rename namespaces and projects with an invalid path See merge request !11338
*	Use new SnippetsFinder signature in APIbvl-9-2-security-patches	Bob Van Landuyt	2017-05-10	1	-2/+2
\|
*	Merge branch 'tc-fix-private-subgroups-shown' into 'security'	Douwe Maan	2017-05-10	2	-2/+2
\| \| \| \| \|	Use GroupsFinder to find subgroups the user has access to See merge request !2096
*	Merge branch 'snippets-finder-visibility' into 'security'	Douwe Maan	2017-05-10	4	-8/+6
\| \| \| \| \| \|	Refactor snippets finder & dont return internal snippets for external users See merge request !2094
*	Merge branch '31157-respect-project-features-in-wiki-search' into 'security'	Douwe Maan	2017-05-10	1	-0/+4
\| \| \| \| \|	Respect project features in wiki and blob search See merge request !2089
*	Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'	Robert Speicher	2017-05-10	1	-18/+18
\| \| \| \| \| \|	(security-9-1) Add correct `rel` attributes to external links when rendering markdown See merge request !2097
*	Merge branch 'bvl-security-9-1-markup-pipeline'	Robert Speicher	2017-05-10	3	-7/+20
\| \| \| \| \| \|	(security-9-1) Render asciidoc & other markup using banzai in a pipeline See merge request !2098
*	Merge branch 'mr-widget-redesign-review' into 'master'	Jacob Schatz	2017-05-09	1	-4/+4
\| \| \| \| \| \| \| \|	Merge request widget redesign Closes #25424 and #27950 See merge request !10319
*	Merge branch ↵	Sean McGivern	2017-05-09	1	-0/+1
\| \| \| \| \| \| \| \|	'Add-index_redirect_routes_path_for_link-migration-to-setup_postgresql' into 'master' Add index_redirect_routes_path_for_link migration to setup_postgresql See merge request !11165
*	Merge branch 'fix/gl-project-id' into 'master'	James Lopez	2017-05-08	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Omit gl_project_id from Import/Export Closes #29813 See merge request !11032
\| *	remove gl_project_id for I/E version updatefix/gl-project-id	James Lopez	2017-05-02	1	-1/+0
\| \|
* \|	Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master'	Robert Speicher	2017-05-07	1	-1/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for commit diff ignore_whitespace_change and paths flags Closes gitaly#198 See merge request !11028
\| * \|	Re-enable Gitaly commit_raw_diff feature	Ahmad Sherif	2017-05-07	1	-1/+3
\| \| \|
* \| \|	Add Pipeline Schedules that supersedes experimental Trigger Schedule	Zeger-Jan van de Weg	2017-05-07	4	-5/+6
\|/ /
* \|	Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ↵	Kamil Trzciński	2017-05-06	12	-33/+50
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Check access to a branch when user triggers manual action Closes #20261 See merge request !10494
\| * \|	Refine inheritance model of extended CI/CD statuses	Grzegorz Bizon	2017-05-05	9	-32/+16
\| \| \|
\| * \|	Introduce generic manual action extended status class	Grzegorz Bizon	2017-05-05	3	-6/+26
\| \| \|
\| * \|	Check ability to update build on the API resource	Grzegorz Bizon	2017-05-05	2	-5/+14
\| \| \|
\| * \|	Use update build policy instead of new play policy	Grzegorz Bizon	2017-05-05	1	-1/+1
\| \| \|
\| * \|	Merge commit '3a2b60f7' from 'master'	Grzegorz Bizon	2017-05-05	16	-52/+94
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (151 commits) Fixed Karma spec Reject EE reserved namespace paths in CE as well Updated webpack config Include the bundler:audit job into the static-analysis job Document serializers Add artifact file page that uses the blob viewer Pipeline table mini graph dropdown remains open when table is refreshed Adds off for event hub Compile gitlab-shell go executables Allow to create new branch and empty WIP merge request from issue page Moved to a view spec Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.md Convert seconds to minutes and hours on chat notifations Disable navigation to Pages config if Pages is disabled Sort the network graph both by commit date and topographically. Add tooltips to note action buttons Add breadcrumb, build header and pipelines submenu to artifacts browser Update todos screenshots removes the possibility of commit messages having carriage returns Handle incoming emails from aliases correctly ...
\| * \ \	Merge branch 'master' into ↵	Grzegorz Bizon	2017-05-03	20	-75/+510
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/manual-actions-protected-branches-permissions * master: (103 commits) Include missing project attributes to Import/Export Create the rest of the wiki docs Fill in information about creating the wiki Home page Move wiki doc to its own index page Create initial file for Wiki documentation Default to null user when asignee is unselected Re-enable ref operations with gitaly after not-found fix #31560 Add repo parameter to gitaly:install and workhorse:install Remove N+1 queries when checking nodes visible to user Don't validate reserved words if the format doesn't match Revert "Shorten and improve some job names" Remove unused initializer DRY the `<<: *except-docs` a bit in `.gitlab-ci.yml` Make the static-analysis job be run for docs branches too Add download_snippet_path helper Refresh the markdown cache if it was `nil` Add some documentation for the new migration helpers Update comments Display comments for personal snippets Update docs on creating a project ...
\| * \ \ \	Merge branch 'master' into ↵	Grzegorz Bizon	2017-05-02	55	-254/+1242
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/manual-actions-protected-branches-permissions * master: (314 commits) Better Explore Groups view Update Carrierwave and fog-core Add specs for Gitlab::RequestProfiler Add scripts/static-analysis to run all the static analysers in one go Shorten and improve some job names Group static-analysis jobs into a single job Don't blow up when email has no References header Update CHANGELOG.md for 9.1.2 Add changelog Add changelog Show Raw button as Download for binary files Use blob viewers for snippets Fix typo Fixed transient failure related to dropdown animations Revert "Merge branch 'tc-no-todo-service-select' into 'master'" fix link to MR 10416 Another change from .click -> .trigger('click') to make spec pass Change from .click -> .trigger('click') to make spec pass Disable AddColumnWithDefaultToLargeTable cop for pre-existing migrations Add AddColumnWithDefaultToLargeTable cop ... Conflicts: spec/requests/api/jobs_spec.rb
\| * \| \| \| \|	Extend action tooltop to show info about abilities	Grzegorz Bizon	2017-05-01	1	-1/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into ↵	Grzegorz Bizon	2017-04-22	36	-160/+299
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/manual-actions-protected-branches-permissions * master: (274 commits) Update VERSION to 9.2.0-pre Update CHANGELOG.md for 9.1.0 Update Auto Deploy documentation Disable import URL field in New project form since it's hidden by default Remove reference to burndown charts since they don't exist for ce. Use master_password for Sentinel Refactor Discussions docs Start versioning cached markdown fields Refactor add_users method for project and group Improved the spec Now correctly tests against different forms Refactor environments components into vue files - part 3 Adding animation for all dropdown fix placeholder visibility submodule_links: handle urls that don't end with .git Add help regarding vue resource and where to include it Append .json to ajax endpoint to prevent browser to display raw json Fixed the preview keyboard shortcut focusing wrong tab Fix broken link Added new discussions docs Started on resolvable discussions docs ...
\| * \ \ \ \ \	Merge branch 'master' into ↵	Grzegorz Bizon	2017-04-13	84	-441/+1814
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/manual-actions-protected-branches-permissions * master: (641 commits) Revert "Fix registry for projects with uppercases in path" Fix registry for projects with uppercases in path Move event icons into events_helper Reset New branch button when issue state changes Add link to environments on kubernetes.md Indent system notes on desktop screens Improve webpack-dev-server compatibility with non-localhost setups. Add changelog entry Fix recent searches icon alignment in Safari Use preload to avoid Rails using JOIN Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error Prepare for zero downtime migrations Fix filtered search input width for IE Fix the `gitlab:gitlab_shell:check` task Fixed random failures with Poll spec Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates Let uses hide verbose output by default Separate examples for each other Collapse similar sibling scenarios Use empty_project for resources that are independent of the repo ... Conflicts: app/views/projects/ci/builds/_build.html.haml
\| * \| \| \| \| \| \|	Use build policy to determine if user can play build	Grzegorz Bizon	2017-04-12	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Do not show play action if user not allowed to run it	Grzegorz Bizon	2017-04-06	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Real time pipeline show action	Zeger-Jan van de Weg	2017-05-06	3	-1/+39
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '17361-redirect-renamed-paths' into 'master'	Sean McGivern	2017-05-06	4	-3/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Redirect to new project link after a rename" Closes #17361 and #30317 See merge request !11136
\| * \| \| \| \| \| \| \|	Index redirect_routes path for LIKE	Michael Kozono	2017-05-05	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Redirect from redirect routes to canonical routes	Michael Kozono	2017-05-05	3	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/fork-spec-mysql' into 'master'	Stan Hu	2017-05-06	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix fork_spec failure to do with mySQL Closes #31870 See merge request !11121
\| * \| \| \| \| \| \| \| \|	workaround spec failure for mySQL invalid date issuefix/fork-spec-mysql	James Lopez	2017-05-05	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2017-05-05	6	-79/+67
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce' into 'master' Generate and handle a gl_repository param to pass around components Closes #29925 See merge request !10992
\| * \| \| \| \| \| \| \| \| \|	Pass GL_REPOSITORY in Workhorse responses29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce	Alejandro Rodríguez	2017-05-05	3	-3/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Allow gl-repository strings as project identifiers in PostReceive worker	Alejandro Rodríguez	2017-05-05	1	-26/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Generate and handle a gl_repository param to pass around components	Alejandro Rodríguez	2017-05-03	4	-51/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This new param allows us to share project information between components that don't share or don't have access to the same filesystem mountpoints, for example between Gitaly and Rails or between Rails and Gitlab-Shell hooks. The previous parameters are still supported, but if found, gl_repository is prefered. The old parameters should be deprecated once all components support the new format.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable'	Sean McGivern	2017-05-05	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Update Import/Export files	blackst0ne	2017-05-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mia_backort' into 'master'	Jacob Schatz	2017-05-05	14	-40/+74
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of Multiple Assignees feature See merge request !11089
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵	Valery Sizov	2017-05-05	28	-49/+217
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	skip]
\| * \| \| \| \| \| \| \| \| \| \|	[Multiple issue assignee] Fix a number of specs	Valery Sizov	2017-05-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	[Multiple issue assignee]: reslving some conflicts	Valery Sizov	2017-05-04	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Backport of multiple_assignees_feature [ci skip]	Valery Sizov	2017-05-04	13	-38/+76
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-sentry-js-again-with-vue' into 'master'	Phil Hughes	2017-05-05	2	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add sentry JS See merge request !6764
\| * \| \| \| \| \| \| \| \| \| \|	Review changesadd-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-05-05	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'add-sentry-js-again-with-vue'	Luke "Jared" Bennett	2017-05-04	6	-12/+27
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \| \| \| \| \|	Removed clientside_sentry ref in settings.rb	Luke "Jared" Bennett	2017-05-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Review changes, removed api/v3 updates as its frozen, removed the ↵	Luke "Jared" Bennett	2017-05-04	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clientside_sentry properties from the sensitive data filter as they\'re both available publically
\| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-05-04	10	-39/+65
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|