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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'dz-nested-groups-improvements-3' into 'master'	Dmitriy Zaporozhets	2017-02-15	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Nested groups improvements pt 3 See merge request !9227
\| *	Merge branch 'master' into 'dz-nested-groups-improvements-3'	Dmitriy Zaporozhets	2017-02-14	3	-56/+16
\| \|\ \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/api/projects.md
\| * \|	Expose Namespace#full_path in namespaces API	Dmitriy Zaporozhets	2017-02-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'pass_coverage_value_to_commit_status_api' into 'master'	Rémy Coutable	2017-02-15	2	-2/+4
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it possible to pass coverage value to commit status API Closes #27807 See merge request !9214
\| * \|	Make it possible to pass coverage value to commit status API	wendy0402	2017-02-14	2	-2/+4
\| \|/
* \|	API: Consolidate /projects endpoint	Toon Claes	2017-02-14	3	-55/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It consolidates these endpoints: - /projects - /projects/owned - /projects/visible - /projects/starred - /projects/all Into the /projects endpoint using query parameters.
* \|	Move /projects/fork/:id to /projects/:id/fork14492-change-fork-endpoint	Oswaldo Ferreira	2017-02-13	1	-1/+1
\|/
*	Remove deprecated templates endpoints in V422818-licence-gitignore-and-yml-endpoints-removal	Oswaldo Ferreira	2017-02-13	3	-56/+162
\|
*	Merge branch '20732_member_exists_409' into 'master'	Sean McGivern	2017-02-13	3	-10/+138
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add member: Always return 409 when a member exists Closes #20732 See merge request !9093
\| *	Add member: Always return 409 when a member exists	Jarka Kadlecova	2017-02-10	3	-10/+138
\| \|
* \|	Merge branch 'zj-drop-ruby-21-tests' into 'master'	Rémy Coutable	2017-02-13	2	-4/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-4/+2
\| \| \|
* \| \|	Merge branch 'rename_files_delete_service' into 'master'	Rémy Coutable	2017-02-13	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Files::DeleteService to Files::DestroyService See merge request !9110
\| * \| \|	Rename Files::DeleteService to Files::DestroyService	dixpac	2017-02-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reason for renaming is to comply with naming convention of services in codebase.
* \| \| \|	Merge branch '1051-api-create-users-without-password' into 'master'	Rémy Coutable	2017-02-10	1	-2/+14
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optionally make users created via the API set their password Closes #1051 See merge request !8957
\| * \| \|	Optionally make users created via the API set their password	Joost Rijneveld	2017-02-09	1	-2/+14
\| \| \| \|
* \| \| \|	Update MergeRequest API state_event option documentationjej-update-mr-state-event-docs	James Edwards-Jones	2017-02-09	1	-1/+1
\| \|_\|/ \|/\| \|
* \| \|	Merge branch 'dz-nested-groups-api' into 'master'	Dmitriy Zaporozhets	2017-02-09	2	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nested groups API See merge request !9034
\| * \| \|	Add nested groups to the APIdz-nested-groups-api	Dmitriy Zaporozhets	2017-02-08	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'rename_delete_services' into 'master'	Rémy Coutable	2017-02-08	3	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inconsistent naming for services that delete things See merge request !5803
\| * \| \| \|	Fix inconsistent naming for services that delete things	dixpac	2017-02-08	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 '23104-remove-public-param-for-projects' into 'master'	Douwe Maan	2017-02-08	1	-15/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: remove `public` param for projects Closes #23104 See merge request !8736
\| * \| \| \| \|	API: remove `public` param for projects	Toon Claes	2017-02-07	1	-15/+4
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The create and edit actions for projects had these parameters: - `public` (optional) - if true same as setting `visibility_level = 20` - `visibility_level` (optional) Remove the `public` parameter to avoid contradiction.
* \| \| \| \|	Remove /projects/:id/keys/.. endpoints	Robert Schilling	2017-02-07	3	-89/+206
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge branch 'api-remove-snippets-expires-at' into 'master'	Sean McGivern	2017-02-07	7	-74/+223
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated 'expires_at' from project snippets API Closes #14156 See merge request !8723
\| * \| \|	Split V3 entities into a separate fileapi-remove-snippets-expires-at	Robert Schilling	2017-02-07	6	-93/+95
\| \| \| \|
\| * \| \|	Remove deprecated 'expires_at' from project snippets API	Robert Schilling	2017-02-07	3	-3/+150
\| \| \| \|
* \| \| \|	Merge branch 'jej-pages-to-ce' into 'master'	Douwe Maan	2017-02-06	1	-1/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding GitLab Pages to CE Closes #14605, gitlab-com/infrastructure#1058, gitlab-ee#1333, and #323 See merge request !8463
\| * \| \|	Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce	James Edwards-Jones	2017-02-06	7	-20/+469
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \|	Merge branch 'master' into jej-pages-picked-from-ee	James Edwards-Jones	2017-02-03	8	-10/+10
\| \|\ \ \
\| * \| \| \|	Ported max_pages_size in settings API to CE	James Edwards-Jones	2017-02-02	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Remove deprecated MR and Issue endpoints and preserve V3 namespace9-0-api-changes	Oswaldo Ferreira	2017-02-06	5	-146/+644
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge branch 'terminal-max-session-time' into 'master'	Kamil Trzciński	2017-02-06	2	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce maximum session time for terminal websocket connection Closes #26263 See merge request !8413
\| * \| \| \|	Introduce maximum session time for terminal websocket connectionterminal-max-session-time	Adam Niedzielski	2017-02-06	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store the value in application settings. Expose the value to Workhorse.
* \| \| \| \|	Merge branch '22007-unify-projects-search' into 'master'	Rémy Coutable	2017-02-06	3	-17/+464
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify projects search by removing /projects/:search endpoint Closes #22007 See merge request !8877
\| * \| \| \| \|	Remain V3 endpoint unchanged	Oswaldo Ferreira	2017-01-30	2	-1/+464
\| \| \| \| \| \|
\| * \| \| \| \|	Unify projects search by removing /projects/:search endpoint	Oswaldo Ferreira	2017-01-30	1	-16/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'api-fix-files' into 'master'	Rémy Coutable	2017-02-06	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Fix file downloading See merge request !8953
\| * \| \| \| \|	API: Fix file downloading	Robert Schilling	2017-02-03	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'add-issues-to-boards' into 'master'	Fatih Acet	2017-02-03	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add issues to boards list Closes #26205 See merge request !8737
\| * \| \| \|	Update the API endpoint to get the lists of a project board	Douglas Barbosa Alexandre	2017-02-03	1	-1/+1
\| \|/ / /
* \| \| \|	Merge branch '17662-rename-builds' into 'master'	Kamil Trzciński	2017-02-03	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Rename "Builds" to "Pipelines", "CI/CD Pipelines", or "Jobs" everywhere" Closes #17662 See merge request !8787
\| * \| \|	Fix broken tests17662-rename-builds	Filipa Lacerda	2017-02-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Build to Job Replace "Builds" by "Jobs" and fix broken specs Replace "Builds" by "Jobs" Fix broken spinach test Fix broken test Remove `˙` at the beginning of the file Fix broken spinach test Fix broken tests Changes after review
* \| \| \|	Merge branch 'fwn-to-find-by-full-path' into 'master'	Dmitriy Zaporozhets	2017-02-03	2	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	replace `find_with_namespace` with `find_by_full_path` See merge request !8949
\| * \| \| \|	replace `find_with_namespace` with `find_by_full_path`	Adam Pahlevi	2017-02-03	2	-3/+3
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	add complete changelog for !8949
* \| \| \|	Merge branch '24606-force-password-reset-on-next-login' into 'master'	Sean McGivern	2017-02-03	1	-0/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Force new password after password reset via API Closes #24606 See merge request !8933
\| * \| \|	Force new password after password reset via API	George Andrinopoulos	2017-02-02	1	-0/+2
\| \|/ /
* \| \|	Merge branch 'fix-git-hooks-when-creating-file' into 'master'	Douwe Maan	2017-02-02	2	-4/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't execute git hooks if you create branch as part of other change Closes #23439 See merge request !7237
\| * \ \	Merge remote-tracking branch 'upstream/master' into ↵fix-git-hooks-when-creating-file	Lin Jen-Shin	2017-02-02	2	-3/+11
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix-git-hooks-when-creating-file * upstream/master: (190 commits) Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Fix small typo on new branch button spec Improve styling of the new issue message Don't capitalize environment name in show page Abillity to promote project labels to group labels Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. 19164 Add settings dropdown to mobile screens cop for gem fetched from a git source Add CHANGELOG entry ...
\| * \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-01-26	21	-137/+345
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix-git-hooks-when-creating-file * upstream/master: (1122 commits) Update CHANGELOG.md for 8.16.2 Display project ID in project settings (!8572) fixed points from comments to improve code quality Update CHANGELOG.md for 8.14.8 Statisfy eslint Add CHANGELOG entry Fix access to the wiki code via HTTP when repository feature disabled Display fullscreen button on small screens (!5302) Prevent removing fields from dropdowns on input elements fix for all themes Return struct instead of multiple values Fix race conditions for AuthorizedProjectsWorker Add User#nested_groups and User#nested_projects methods Fix spec failure due to timestamp ordering issue in mySQL Fixed error with filter keyboard tests `can?` already includes the `feature_available?` check Test there is no Merge Request button when MRs are disabled Ensure the correct Merge Request button is found Add 409 conflict tests Add CHANGELOG ...