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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Rémy Coutable	2016-01-13	2	-6/+12
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	fix/private-references
\| * \| \| \| \| \| \|	Ensure the API doesn't return notes that the current user shouldn't see	Rémy Coutable	2016-01-13	1	-2/+19
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '8-4-stable' into ci/api-triggers	Tomasz Maczukin	2016-01-14	5	-10/+47
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 8-4-stable: (280 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Version 8.4.0.rc1 Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR ...
\| * \| \| \| \| \|	Merge branch 'ci/api-projects' into 'master'	Douwe Maan	2016-01-13	2	-6/+12
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extend projects API with CI data Reference #4264 See merge request !2303
\| \| * \| \| \| \|	Modify CI features in projects APIci/api-projects	Tomasz Maczukin	2016-01-11	3	-31/+16
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update ./doc/api	Tomasz Maczukin	2016-01-07	1	-0/+9
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add ci fields in project create/update feature API	Tomasz Maczukin	2016-01-05	2	-4/+13
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add CI data to projcet entity	Tomasz Maczukin	2016-01-05	1	-0/+3
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'api-project-upload' into 'master'	Robert Speicher	2016-01-08	1	-1/+11
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API project upload endpoint Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317 See merge request !2329
\| \| * \| \| \|	Add API project upload endpoint	Douwe Maan	2016-01-07	1	-1/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Delete tag via APIapi-delete-tag	Robert Schilling	2016-01-08	1	-0/+21
\| \|/ / / /
\| * \| \| \|	Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-unchecked	Douwe Maan	2016-01-06	1	-1/+1
\| \|\ \ \ \
\| \| * \ \ \	Merge branch 'feature/detailed-user-endpoint' of ↵	Dmitriy Zaporozhets	2016-01-06	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \|	https://gitlab.com/Michi302/gitlab-ce
\| \| \| * \| \|	Make single user API endpoint return Entities::User instead of ↵	Michi302	2015-12-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Entities::UserBasic
\| * \| \| \| \|	Get "Merge when build succeeds" to work when commits were pushed to MR ↵	Douwe Maan	2016-01-05	1	-1/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	target branch while builds were running
\| * \| \| \|	Fix API project lookups when querying with a namespace with dots	Stan Hu	2016-01-03	1	-1/+1
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Attempting to use the /projects/:id API by specifying :id in "namespace/project" format would always result in a 404 if the namespace contained a dot. The reason? From http://guides.rubyonrails.org/routing.html#specifying-constraints: "By default the :id parameter doesn't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within an :id add a constraint which overrides this - for example id: /[^\/]+/ allows anything except a slash." Closes https://github.com/gitlabhq/gitlabhq/issues/9573
* \| \| \|	Add some fixes after review	Tomasz Maczukin	2016-01-13	2	-13/+6
\| \| \| \|
* \| \| \|	Change 'trigger_id' to 'token' as resource ID in triggers API	Tomasz Maczukin	2016-01-07	2	-18/+9
\| \| \| \|
* \| \| \|	Get show details feature to triggers API	Tomasz Maczukin	2016-01-05	1	-0/+26
\| \| \| \|
* \| \| \|	Add create feature to triggers API	Tomasz Maczukin	2016-01-05	1	-0/+16
\| \| \| \|
* \| \| \|	Add delete feature to triggers API	Tomasz Maczukin	2016-01-05	1	-0/+19
\| \| \| \|
* \| \| \|	Add triggers feature to API	Tomasz Maczukin	2016-01-04	2	-0/+28
\|/ / /
* \| \|	Revert upvotes and downvotes params to MR API	Valery Sizov	2015-12-28	1	-1/+0
\|/ /
* \|	Add API support for looking up a user by username	Stan Hu	2015-12-24	1	-4/+10
\|/ \| \| \|	Needed to support Huboard
*	Merge branch 'edit-on-fork' into 'master'	Dmitriy Zaporozhets	2015-12-24	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatically fork a project when not allowed to edit a file. Fixes #3215. To do: - [ ] Add tests ----- ## "Edit" button on file in a project the user does NOT have write access to ![edit_file](/uploads/7602157420768aef483a6586bba2d164/edit_file.png) ## Clicking will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the edit page on the original project with a notice ![edit_notice](/uploads/94ed1319404370ff1e9c0d672fb41e03/edit_notice.png) ## The user cannot change the target branch and is informed that editing will start an MR ![edit_footer](/uploads/4da68d4795c7177e575b7c434d16eeae/edit_footer.png) ## Hitting "Commit changes" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.38.08](/uploads/d777a4db6f38a5a1be84031694465bc1/Screen_Shot_2015-12-17_at_23.38.08.png) ----- ## "Create file, "Upload file" and "New directory" buttons in a project the user does NOT have write access to ![new_directory](/uploads/72f556248f30d6652523bbb4be01b3e0/new_directory.png) ## Clicking any of these options will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the tree page on the original project with a notice ![new_directory_notice](/uploads/a1a3e11308ae0e8f0913fae6813a37ed/new_directory_notice.png) ## Clicking "New directory" again will show the modal. The user cannot change the target branch and is informed that editing will start an MR ![new_dir](/uploads/99ca8cbfb2f70603e352b3fdf67b6281/new_dir.png) ## Hitting "Create directory" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.39.19](/uploads/3713d0235abf831361b803a6198c5bc1/Screen_Shot_2015-12-17_at_23.39.19.png) cc @dzaporozhets @skyruler See merge request !2145
\| *	Automatically fork a project when not allowed to edit a file.	Douwe Maan	2015-12-18	1	-1/+1
\| \|
* \|	Add project permissions to all project API endpoints	Stan Hu	2015-12-22	1	-3/+3
\|/ \| \| \|	This standardizes all the project API formats. Also needed to support Huboard.
*	Merge branch 'api-support-starred-projects' into 'master'	Dmitriy Zaporozhets	2015-12-16	1	-0/+11
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Api support for requesting starred projects for user Closes #4112 Note: probably targets the wrong release in the `CHANGELOG`, though 8.4 was not there yet See merge request !2127
\| *	Api support for requesting starred projects for user	Zeger-Jan van de Weg	2015-12-16	1	-0/+11
\| \| \| \| \| \| \| \|	Fixes #4112
* \|	Fix Rubocop complain.fix_rubocop	Rubén Dávila	2015-12-16	1	-1/+1
\|/
*	Merge branch 'add-open-issues-count-to-api' of ↵	Dmitriy Zaporozhets	2015-12-16	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/stanhu/gitlab-ce Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Add open_issues_count to project API	Stan Hu	2015-12-11	1	-0/+1
\| \| \| \| \| \| \| \|	This is needed to support Huboard and a generally useful value.
* \|	Fixed Rubocop offenses	Gabriel Mazetto	2015-12-15	1	-1/+1
\| \|
* \|	Fix triggers tests	Kamil Trzcinski	2015-12-11	1	-1/+1
\| \|
* \|	Reimplement Trigger API	Kamil Trzcinski	2015-12-11	3	-0/+53
\| \|
* \|	Migrate CI::Project to Project	Kamil Trzcinski	2015-12-11	4	-7/+9
\| \|
* \|	Migrate CI::Services and CI::WebHooks to Services and WebHooks	Kamil Trzcinski	2015-12-10	2	-2/+5
\|/
*	Merge branch 'master' into merge-if-green	Douwe Maan	2015-12-08	1	-0/+12
\|\ \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/merge_requests/widget/_heading.html.haml # app/views/projects/merge_requests/widget/open/_accept.html.haml
\| *	Merge branch 'master' into ui/dashboard-new-issueui/dashboard-new-issue	Douwe Maan	2015-12-08	1	-2/+6
\| \|\
\| * \	Merge branch 'master' into ui/dashboard-new-issue	Douwe Maan	2015-12-07	2	-0/+19
\| \|\ \
\| * \| \|	Add API group projects endpoint.	Douwe Maan	2015-12-07	1	-0/+12
\| \| \| \|
* \| \| \|	Merge branch 'master' into zj/gitlab-ce-merge-if-green	Douwe Maan	2015-12-08	1	-2/+6
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Fix API setting of 'public' attribute to false will make a project private	Stan Hu	2015-12-05	1	-2/+6
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Closes #3864
* \| \|	Merge branch 'master' into merge-if-green	Zeger-Jan van de Weg	2015-12-07	3	-8/+56
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'extend-events-api'	Dmitriy Zaporozhets	2015-12-04	1	-0/+3
\| \|\ \
\| \| * \|	Extent Event and Note APIextend-events-api	Dmitriy Zaporozhets	2015-12-04	1	-0/+3
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add note to Events API * add author section to Events API * add noteable_id and noteable_type to Notes API Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add API endpoint to fetch merge request commits list	Dmitriy Zaporozhets	2015-12-04	1	-0/+16
\| \|/ \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Merge branch 'fix-award-emoji-api' into 'master'	Robert Speicher	2015-11-22	1	-0/+5
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add upvote/downvote fields to merge request and note API to preserve compatibility As discussed in !1825 we should not break the API compatibility. * This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`. * Add the fields `upvote`/`downvote` to the notes API, which always return `false` This behavior is documented in the API docs. See merge request !1867
\| \| *	Add upvote/downvote fields to merge request and note API to preserve ↵fix-award-emoji-api	Robert Schilling	2015-11-21	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|	compatibility
\| * \|	Allow editing a release in API via PUT method	Robert Schilling	2015-11-21	1	-0/+21
\| \| \|