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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabs	Filipa Lacerda	2017-02-23	7	-59/+40
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (361 commits) Code style improvements remove require.context from network_bundle remove require.context from graphs_bundle remove require.context from filtered_search_bundle Ignore two Rails CVEs in bundler:audit job Remove Pages readme Change Pages redirect Add missing index.md to Pages docs Added double newline after file upload markdown insert Reorder main index items in Pages overview remove html comments remove <> wrapping text - part 3 wrapping text - part 2 [ci skip] fix link wrap text - part 1 - [ci skip] typo fix spelling, add intermediate cert link Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag remove link to unfinished video ...
\| *	Merge branch 'add_mr_info_to_issues_list' into 'master'	Sean McGivern	2017-02-22	2	-2/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add merge request count to each issue on issues list Closes #19786 and #23208 See merge request !9252
\| \| *	Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_list	blackst0ne	2017-02-21	4	-16/+7
\| \| \|\
\| \| * \|	Add merge request count to each issue on issues list	blackst0ne	2017-02-17	2	-2/+2
\| \| \| \|
\| * \| \|	Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'	Sean McGivern	2017-02-22	2	-38/+17
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spam check and reCAPTCHA improvements Closes #28093 See merge request !9248
\| \| * \| \|	Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-edit	Oswaldo Ferreira	2017-02-21	2	-38/+17
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'add-filtered-search-to-mr' into 'master'	Alfredo Sumaran	2017-02-22	1	-0/+11
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add filtered search to MR page Closes #27131 See merge request !9284
\| \| * \| \|	Add filtered search to MR pageadd-filtered-search-to-mr	Clement Ho	2017-02-21	1	-0/+11
\| \| \|/ /
\| * \| \|	No more and/or	Douwe Maan	2017-02-21	2	-3/+3
\| \|/ /
\| * \|	Merge branch '21240_snippets_line_ending' into 'master'	Sean McGivern	2017-02-20	1	-12/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Download snippets with LF line-endings by default Closes #21240 See merge request !8999
\| \| * \|	Download snippets with LF line-endings by default	Jarka Kadlecova	2017-02-20	1	-12/+1
\| \| \| \|
\| * \| \|	Merge branch '27920-both-wip-messages-showing' into 'master'	Fatih Acet	2017-02-17	2	-1/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dispatch needed JS when creating a new MR in diff view Closes #27920 See merge request !9238
\| \| * \| \|	Dispatch needed JS when creating a new MR in diff view27920-both-wip-messages-showing	Sam Rose	2017-02-14	2	-1/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'use-update-runner-service' into 'master'	Kamil Trzciński	2017-02-17	1	-3/+3
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prefer service object over after_save hook Closes #26921 See merge request !8664
\| \| * \| \|	Merge remote-tracking branch 'upstream/master' into use-update-runner-service	Lin Jen-Shin	2017-02-15	16	-62/+141
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (488 commits) Remove duplicate CHANGELOG.md entries for 8.16.5 Update CHANGELOG.md for 8.14.9 Update CHANGELOG.md for 8.15.6 #27631: Add missing top-area div to activity header page Update CHANGELOG.md for 8.16.5 Update CHANGELOG.md for 8.16.5 Update CHANGELOG.md for 8.16.5 Fix yarn lock and package.json mismatch caused by MR 9133 sync yarn.lock with recent changes to package.json Add changelog Fix z index bugs Add Links to Branches in Calendar Activity SidekiqStatus need to be qualified in some cases Replace static fixture for behaviors/requires_input_spec.js (!9162) API: Consolidate /projects endpoint Add MySQL info in install requirements Fix timezone on issue boards due date Use Gitlab::Database.with_connection_pool from !9192 Disconnect the pool after done Use threads directly, introduce pool later: ...
\| \| * \ \ \	Merge remote-tracking branch 'upstream/master' into use-update-runner-service	Lin Jen-Shin	2017-02-07	4	-4/+75
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (379 commits) Fixed failing tests because list doens't exist Add changelog file Update system_note_service_spec.rb Remove noteable object in time tracking system notes [ci-skip] Make all system notes lowercase Fixed eslint Don't render snippet actions for logged-out users Remove deprecated MR and Issue endpoints and preserve V3 namespace Removed additional dropdown list animations Improve docs on CI/CD code coverage regexp setting Improve Changelog entry for CI config compatibility fix Refine docs on code coverage regexp on job level Introduce maximum session time for terminal websocket connection Add Changelog entry for CI config compatibility fix Map configuration to directory locations and add defaults to NFS HA doc. Update docs on setting up a CI/CD coverage regexp Fix Rubocop offense in legacy CI/CD config specs add CHANGELOG entry for !8988 transpile all javascript files with babel add npm run webpack command ...
\| \| * \ \ \ \	Merge remote-tracking branch 'upstream/master' into use-update-runner-service	Lin Jen-Shin	2017-02-04	13	-36/+95
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (589 commits) Backport changes from EE squash Fix broken tests Rename Build to Job Adds changelog entry Change "Build" to "Job" in builds show page header and sidebar replace `find_with_namespace` with `find_by_full_path` PlantUML support for Markdown remove dateFormat global exception fix relative paths to xterm.js within fit.js use setFixtures instead of fixture.set prevent u2f tests from triggering a form submission while testing simplify test for focus state preload projects.json fixture preload projects.json fixture rework tests which rely on teaspoon-specific behavior Only render hr when user can't archive project. use setFixtures instead of fixture.set ensure helper classes and constants are exposed globally preload projects.json fixture fix fixture references in environments_spec allow console.xxx in tests, reorder eslint rules alphabetically ...
\| \| * \| \| \| \| \|	Prefer service object over after_save hook	Lin Jen-Shin	2017-01-21	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #26921
* \| \| \| \| \| \| \|	Adds Pending and Finished tabs to pipelines page	Filipa Lacerda	2017-02-16	1	-2/+10
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken test
* \| \| \| \| \| \|	Merge branch 'paginate-environments-bundle' into 'master'	Fatih Acet	2017-02-16	1	-5/+30
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Paginate environments bundle Closes #25499 See merge request !9302
\| * \ \ \ \ \ \	Merge branch 'fe-paginated-environments-api' into ↵paginate-environments-bundle	Filipa Lacerda	2017-02-16	1	-5/+30
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'paginate-environments-bundle' Integrate with new environments API See merge request !8954
\| \| * \| \| \| \| \| \|	Add count keys to response JSONfe-paginated-environments-api	Z.J. van de Weg	2017-02-15	1	-3/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' into fe-paginated-environments-api	Filipa Lacerda	2017-02-12	2	-4/+8
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (97 commits) convert js-cookie dependency to an npm module convert timeago.js dependency to an npm module remove vue from vendor since it is now in node_modules Add CHANGELOG file Stylize blockquote in notification emails Add js prefix to right sidebar Replace accidentally deleted metaclick Remove right padding from navbar-collapse on large screens Add changelog common_utils merge conflicts Set sidebar height to 100% if at top of page Set height of fixed sidebars with js Add sticky sidebar on wiki page Fix comment button test for slash commands Fix time tracking spec Fix issue boards sidebar alignment and sidebar toggle spec Fix failing conflicts test Fix build sidebar scrolling Refactor JS Fix pinned sidebar alignment ...
\| \| * \| \| \| \| \| \| \|	Add route for environment folder and expose an API	Grzegorz Bizon	2017-02-09	1	-0/+18
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Resolve 500 error	Filipa Lacerda	2017-02-09	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add support for environment scopes in controller	Grzegorz Bizon	2017-02-09	1	-7/+12
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Enable grouping and pagination in environmnets API	Grzegorz Bizon	2017-02-09	1	-1/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '28176_merge_widget_fix' into 'master'	Sean McGivern	2017-02-16	1	-3/+6
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error in MR widget after /merge slash command Closes #28176 See merge request !9259
\| * \| \| \| \| \| \| \| \|	Fix error in MR widget after /merge slash command	Jarka Kadlecova	2017-02-16	1	-3/+6
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'move_tags_service_to_namespace' into 'master'	Rémy Coutable	2017-02-15	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move tag services to `Tags` namespace See merge request !9231
\| * \| \| \| \| \| \| \|	Move tag services to `Tags` namespace	dixpac	2017-02-14	1	-2/+2
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CreateTagService and DeleteTagService where in root namespace, by following service code organization I moved them in Tags::CreateService and Tags::DestroyService
* \| \| \| \| \| \| \|	Execute web hooks for WikiPage delete operation	Mark Fletcher	2017-02-14	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add a new DestroyService for Wiki Pages * Alter WikiPagesController to use the new service
* \| \| \| \| \| \|	Merge branch '23535-folders-in-wiki-repository' into 'master'	Douwe Maan	2017-02-13	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show directory hierarchy when listing wiki pages Closes #23535 See merge request !8133
\| * \ \ \ \ \ \	Merge branch 'master' into 23535-folders-in-wiki-repository	Alex Braha Stoll	2017-01-29	19	-160/+184
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Render wiki entries using a collection of WikiPage and WikiDirectory objects	Alex Braha Stoll	2016-12-31	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Show directory hierarchy when listing wiki pages	Alex Braha Stoll	2016-12-31	1	-1/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issue_25900_2' into 'master'	Sean McGivern	2017-02-13	2	-4/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gather issuable metadata to avoid n+ queries on index view Closes #25900 See merge request !9006
\| * \| \| \| \| \| \| \| \|	Gather issuable metadata to avoid n+ queries on index viewissue_25900_2	Felipe Artur	2017-02-09	2	-4/+10
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'zj-drop-ruby-21-tests' into 'master'	Rémy Coutable	2017-02-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Rubocop to Ruby 2.3 See merge request !8994
\| * \| \| \| \| \| \| \| \|	Update Rubocop to ruby 2.3zj-drop-ruby-21-tests	Z.J. van de Weg	2017-02-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'rename_files_delete_service' into 'master'	Rémy Coutable	2017-02-13	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Files::DeleteService to Files::DestroyService See merge request !9110
\| * \| \| \| \| \| \| \| \|	Rename Files::DeleteService to Files::DestroyService	dixpac	2017-02-10	1	-4/+4
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reason for renaming is to comply with naming convention of services in codebase.
* \| \| \| \| \| \| \| \|	Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-users	Robert Speicher	2017-02-10	1	-2/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'protected-branch-dropdown-titles' into 'master'	Jacob Schatz	2017-02-10	1	-2/+6
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added header to protected branches access dropdowns See merge request !8774
\| * \| \| \| \| \| \|	Added header to protected branches access dropdownsprotected-branch-dropdown-titles	Phil Hughes	2017-01-26	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE part of https://gitlab.com/gitlab-org/gitlab-ee/issues/1294
* \| \| \| \| \| \| \|	Merge branch 'rename_delete_services' into 'master'	Rémy Coutable	2017-02-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inconsistent naming for services that delete things See merge request !5803
\| * \| \| \| \| \| \| \|	Fix inconsistent naming for services that delete things	dixpac	2017-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Changed name of delete_user_service and worker to destroy * Move and change delete_group_service to Groups::DestroyService * Rename Notes::DeleteService to Notes::DestroyService
* \| \| \| \| \| \| \| \|	Merge branch 'lfs-noauth-public-repo' into 'master'	Rémy Coutable	2017-02-08	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	lfs: do not require auth for public repositories Closes #23360 See merge request !8824
\| * \| \| \| \| \| \| \| \|	lfs: do not require auth for public repositories	Ben Boeckel	2017-02-07	1	-0/+4
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LFS has the `authenticated` field in the response for downloads of objects to indicate that the object does not need authentication to access it. Spec: https://github.com/git-lfs/git-lfs/blob/master/docs/api/batch.md#successful-responses Fixes #23360.
* \| \| \| \| \| \| \| \|	Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master'	Fatih Acet	2017-02-07	1	-2/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix rendering pipelines for a new merge request See merge request !9032