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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Grapify the users APIgrapify-users-api	Robert Schilling	2016-11-21	1	-22/+22
\|
*	Merge branch 'feature/api_owned_resource' into 'master'	Sean McGivern	2016-11-10	1	-0/+9
\|\ \| \| \| \| \| \| \| \|	Add api endpoint `/groups/owned` See merge request !7103
\| *	Added API endpoint groups/owned	Borja Aparicio	2016-11-08	1	-0/+9
\| \|
* \|	Merge branch '23731-add-param-to-user-api' into 'master'	Sean McGivern	2016-11-09	1	-0/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add query param to filter users by 'external' & 'blocked' type on API Closes #23731 See merge request !7109
\| * \|	Add query param to filter users on 'external' & 'blocked' type on API	Yatish Mehta	2016-11-08	1	-0/+14
\| \|/
* \|	Add failed_pipeline and success_pipeline to API doc	Lin Jen-Shin	2016-11-08	1	-1/+7
\| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_17981448
* \|	Merge remote-tracking branch 'upstream/master' into pipeline-notifications	Lin Jen-Shin	2016-11-08	1	-68/+103
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (70 commits) Fix routing spec for group controller Add small improvements to constrainers and specs Faster search Fix broken commits search Changed helper method to check for none on params Moved if statements around in view API: Return 400 when creating a systemhook fails Update non-exist group spinach test to match routing Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2 Replace trigger with the new ID of the docs project Refactor method name 17492 Update link color for more accessible contrast Fixed todos empty state when filtering Refactor namespace regex implements reset incoming email token on issues modal and account page, reactivates all tests and writes more tests for it Use separate email-friendly token for incoming email and let incoming email token be reset Use the Gitlab Workhorse HTTP header in the admin dashboard Refactor project routing Fix 404 when visit /projects page Rewritten spinach git_blame tests to rspec feature tests Add tests for project#index routing ...
\| *	Expose Label id to API	Rares Sfirlogea	2016-11-07	1	-89/+100
\| \| \| \| \| \| \| \| \| \| \| \|	[e44da1c] Add Label API expected keys to tests [ac929c8] Update Label API documentation
\| *	Update label's API documentation	Robert Schilling	2016-11-07	1	-10/+34
\| \|
* \|	Merge remote-tracking branch 'upstream/master' into pipeline-notifications	Lin Jen-Shin	2016-11-05	3	-3/+19
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (74 commits) Fetch locals to avoid undefined method/local error Remove author according to the document Simplify implementation of entity serializers Add documentation for the "Only allow merge requests to be merged if all discussions are resolved" feature Complete and improve specs Add setting to only allow merge requests to be merged when all discussions are resolved Apply `_params_ce + _params_ee` pattern to MergeRequestsController Add tests for deployment and environment entitites Add tests for serialization entities, add user entity Only skip group when it's actually a group in the "Share with group" select Fix: Todos Filter Shows All Users Fix: Guest sees some repository details and gets 404 Move shared params to a helper GrapeDSL for project hooks Update commits.scss updated styling commit SHA on branches page + added to changelog change build list height to show 6,5 builds + improve padding of list, with first/last child selectors Refine build entity tests a little Expose commit author if author exists Ignore builds directory from eslint ...
\| *	Add setting to only allow merge requests to be merged when all discussions ↵	Rodolfo Santos	2016-11-04	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \|	are resolved Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Merge branch 'backport-ee-js-groups-api' into 'master'	Robert Speicher	2016-11-04	1	-2/+6
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport Group API code that was added in EE only Group API code that was added in EE only. /cc @vsizov See merge request !7205
\| \| *	Backport Group API code that was added in EE onlybackport-ee-js-groups-api	Rémy Coutable	2016-10-31	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Document multiple repository storage paths	Nick Thomas	2016-11-04	1	-1/+3
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master' into pipeline-notifications	Lin Jen-Shin	2016-11-04	1	-10/+20
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (23 commits) Clarify the author field for the changelog documentation Add and update .gitignore & .gitlab-ci.yml templates for 8.14 Update "Installation from source" guide for 8.14.0 Add CHANGELOG entries for latest patches Merge branch 'fix/import-export-symlink-vulnerability' into 'security' Merge branch 'fix/import-projectmember-security' into 'security' Use stubs instead of modifying global states Add changelog instructions to CHANGELOG.md Try not to include anything globally! Update help banner for bin/changelog Update docs and test description Update docs and unexpose token Initialize form validation on new group form. Unchange username_validator. Move snake_case to camelCase. Change show-gl-field-errors to gl-show-field-errors Fix changelog. List gl_field_error as gl_field_errors dep. Break out GlFieldError into separate file. Add gl field errors to group name edit form. ...
\| * \|	Merge branch 'zj-expose-system-hooks' into 'master'	Rémy Coutable	2016-11-03	1	-10/+20
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose more info for SystemHooks See merge request !6964
\| \| * \|	Update docs and test descriptionzj-expose-system-hooks	Z.J. van de Weg	2016-11-02	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \|	Update docs and unexpose token	Zeger-Jan van de Weg	2016-11-02	1	-10/+20
\| \| \|/
* \| \|	Merge remote-tracking branch 'upstream/master' into pipeline-notifications	Lin Jen-Shin	2016-11-03	1	-0/+2
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (26 commits) Add a `--force` option to bin/changelog Update examples in changelog docs to use single quotes around title Use the server's base URL without relative URL part when creating links in JIRA Make ESLint ignore instrumented files for coverage analysis (!7236) Check that JavaScript file names match convention (!7238) Removed z-index for filters on issue boards GitLab 8.13 not 13 Replace MR Description Format links Fix gdb backtrace command Update gitlab.yml.example remove extra spaces from app/workers/post_receive.rb Add Rake task to create/repair GitLab Shell hooks symlinks Added guide for upgrading Postgres using Slony Ensure hook tokens are write-only in the API Add support for token attr in project hooks API Add a CHANGELOG entry Fix edit button wiki Updated Sortable JS plugin Allow owners to fetch source code in CI builds fixes milestone dropdown not select issue ...
\| * \|	Merge branch 'gpocentek/gitlab-ce-api-webhook-token' into 'master'	Rémy Coutable	2016-11-02	1	-0/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR adds support for the `token` attribute in the project hook API. Feature requested on a dependant project: https://github.com/gpocentek/python-gitlab/issues/170 See merge request !7220
\| \| * \|	Ensure hook tokens are write-only in the APIgpocentek/gitlab-ce-api-webhook-token	Sean McGivern	2016-11-01	1	-2/+2
\| \| \| \|
\| \| * \|	Add support for token attr in project hooks API	Gauvain Pocentek	2016-11-01	1	-0/+2
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	The UI allows to define a token to validate payload on the target URL, this patch adds the feature to the API.
* \| \|	Add failed_pipeline and success_pipeline to API doc	Lin Jen-Shin	2016-11-02	1	-1/+3
\|/ /
* \|	Merge branch 'add-link-to-issue-boards-in-api-readme' into 'master'	Achilleas Pipinellis	2016-11-01	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add a link to the Issue Boards API in main README See merge request !7221
\| * \|	Add a link to the Issue Boards API in main README	Achilleas Pipinellis	2016-11-01	1	-0/+1
\| \|/ \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'api-projects-fix-mdlink' into 'master'	Sean McGivern	2016-11-01	1	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project visibility level link Fix wrong syntax for link generation. See merge request !7201
\| * \|	Fix project visibility level link	Andrea Scarpino	2016-10-31	1	-3/+3
\| \|/
* \|	Update tags.md	Roman Pickl	2016-10-31	1	-1/+1
\|/
*	Document admin access requirement for /deploy_keys endpoint	winniehell	2016-10-28	1	-1/+1
\|
*	Add missing API endpoints to JIRA service API documentation	Achilleas Pipinellis	2016-10-26	1	-19/+27
\| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/440
*	Merge branch '23146_19131_build-api_scope-doc' into 'master'	Rémy Coutable	2016-10-22	1	-4/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix documents and comments on Build API `scope` Fixes #23146 Fixes #19131 See merge request !7044
\| *	Fix documents and comments on Build API `scope`. #23146 #19131	Lemures Lemniscati	2016-10-22	1	-4/+4
\| \|
* \|	Fix wrong endpoint in api/users documentation, fix same typo in spec ↵	Airat Shigapov	2016-10-21	1	-1/+1
\|/ \| \| \|	describe blocks
*	Merge branch 'patch-1' into 'master'	Rémy Coutable	2016-10-21	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Doc] Fix `ref` parameter name for `commits/statuses` The attribute to filter by branch or tag needs to be named `ref`, not `ref_name`. And indeed the attribute in the JSON response is `ref` (and not `ref_name`). Tested on Gitlab CE 8.9. See merge request !4876
\| *	Fix `ref` parameter name for `commits/statuses`	Pierre de La Morinerie	2016-06-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The attribute to filter by branch or tag needs to be named `ref`, not `ref_name`. And indeed the attribute in the JSON response is `ref` (and not `ref_name`). Tested on Gitlab CE 8.9.
* \|	Remove pagination description from individual doc	Takuya Noguchi	2016-10-20	1	-2/+0
\| \|
* \|	Fix a broken table in Project API doc	Takuya Noguchi	2016-10-20	1	-4/+4
\| \|
* \|	Merge branch 'fix-system-hook-api' into 'master'	Rémy Coutable	2016-10-19	1	-5/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Fix Sytem hooks delete behavior ## What does this MR do? This corrects the delete API for system hooks. Returning 200 is not the right way indicating a hooks is not found. ## What are the relevant issue numbers? Discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6861/diffs#609af00c90e3d5241064d1404e3e018a3235634a_64_62 See merge request !6883
\| * \|	API: Fix Sytem hooks delete behaviorfix-system-hook-api	Robert Schilling	2016-10-14	1	-5/+2
\| \| \|
* \| \|	Merge branch 'dz-rename-user-routes' into 'master'	Robert Speicher	2016-10-17	12	-86/+86
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename users routing from /u/:username to /users/:username for consistency with other routes Renames /u/:username to /users/:username To follow consistency with other routes (like groups) and UsersController name. Now when you can use `/:username` for accessing user page there is no need in shortcut like `/u/` See merge request !6851
\| * \|	Remove /u/ prefix from user pages in documentation	Dmitriy Zaporozhets	2016-10-13	12	-86/+86
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'api-version' into 'master'	Robert Speicher	2016-10-12	2	-0/+24
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Version information ## What does this MR do? Adds a new endpoint to retrieve the version information. ## Why was this MR needed? Clients can now use this information to enable/disable certain API features depending on the version. ## What are the relevant issue numbers? Closes #22608, https://gitlab.com/gitlab-org/gitlab-ce/issues/23148 See merge request !6822
\| * \| \|	API: Version informationapi-version	Robert Schilling	2016-10-12	2	-0/+24
\| \|/ /
* \| \|	Merge branch '17541-move-licenses-api-endpoint-to-templates-licenses' into ↵	Rémy Coutable	2016-10-12	4	-5/+706
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Move `/licenses` api endpoint to `/templates/licenses`" ## What does this MR do? It moves the `/licenses`, `/gitignores` and `/gitlab_ci_ymls` API endpoints under the `/templates` namespace ## Why was this MR needed? In EE we now have somewhat ambiguous API endpoints. `/license` refers to the EE license while `/licenses` (plural) refers to license templates. @DouweM mentioned that we're adding .gitignore templates in #14106 so it may make sense to add a /templates namespace. Then, move the /license templates endpoint to be underneath, along with .gitignore endpoints. Closes #17541 See merge request !5717
\| * \|	Create a new /templates API namespace	Thomas Balthazar	2016-10-12	4	-5/+706
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The /licenses, /gitignores and /gitlab_ci_ymls endpoints are now also available under a new /templates namespace. Old endpoints will be deprecated when GitLab 9.0.0 is released.
* \| \|	Merge branch 'user-events-api' into 'master'	Robert Speicher	2016-10-12	2	-1/+147
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: New /users/:id/events endpoint ## What does this MR do? If add a new `/users/:id/events` endpoint to retrieve a user's contribution events. The events returned are filtered so that only the events for projects that the current user can see are returned (similarly to what we do at the controller level). ## Why was this MR needed? Because it's a nice feature to calculate leaderboards, for instance for #17815. ## What are the relevant issue numbers? Closes #20866. See merge request !6771
\| * \|	Addresses Robert's feedback	Rémy Coutable	2016-10-11	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	API: New /users/:id/events endpoint	Rémy Coutable	2016-10-10	1	-0/+146
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'dz-cleanup-routing' into 'master'	Dmitriy Zaporozhets	2016-10-11	1	-0/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove NamespacesController * removes unnecessary NamespacesController. The main purpose of this controller was redirect to group or user page when URL like https://gitlab.com/gitlab-org was used. Now this functionality is handled by constrainers (like this https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/routes/user.rb#L17-21) and take user to correct controller right from the start. * serve non existing API routes like `/api/v3/whatever` with Grape instead of Rails. Before this change wrong API url was served by rails with not obvious 404, 405 & 500 errors See merge request !6733
\| * \| \|	Better wording in API readme	Dmitriy Zaporozhets	2016-10-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>