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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'start-with-iid-on-new-branch' into 'master'	Rémy Coutable	2016-04-14	1	-5/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Start with iid on branch creation After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name. See merge request !3708
\| *	Start with iid on branch creation	Zeger-Jan van de Weg	2016-04-14	1	-5/+12
\| \|
* \|	Merge branch 'simplify-gitlab-url_builder-15202' into 'master'	Rémy Coutable	2016-04-14	3	-57/+101
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor and expose only Gitlab::UrlBuilder.build(record) ``` $ git grep Gitlab::UrlBuilder app/models/commit.rb: url: Gitlab::UrlBuilder.build(self), app/services/issues/base_service.rb: issue_url = Gitlab::UrlBuilder.build(issue) app/services/merge_requests/base_service.rb: hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request) app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note) lib/gitlab/note_data_builder.rb: base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note) spec/lib/gitlab/note_data_builder_spec.rb: expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note)) spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do ``` Fixes #15202. See merge request !3696
\| * \|	Refactor and expose only Gitlab::UrlBuilder.build(record)simplify-gitlab-url_builder-15202	Rémy Coutable	2016-04-13	3	-57/+101
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Placeholder on milestone form	Phil Hughes	2016-04-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Updated JS spec to include gl_form
* \| \|	Allow empty recipient list when pusher is added	Frank Groeneveld	2016-04-14	1	-2/+35
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #13574
* \| \|	Merge branch 'api-issue-update-and-note-create-backdating-14947' into 'master'	Rémy Coutable	2016-04-14	2	-4/+29
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API issue update and note create back dating Closes #14947 See merge request !3551
\| * \| \|	Allow back dating notes on creation	Michael Greene	2016-04-13	1	-0/+13
\| \| \| \|
\| * \| \|	Allow back dating issues on update	Michael Greene	2016-04-13	1	-4/+16
\| \| \|/ \| \|/\|
* \| \|	Add test to check if top right search form is not presentissue_15222	Alfredo Sumaran	2016-04-13	1	-0/+4
\|/ /
* \|	Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master'	Robert Speicher	2016-04-13	1	-52/+210
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a bug with trailing slash in bamboo_url Also, improve specs for BambooService Similar to !3679. See merge request !3680
\| * \|	Fix a bug with trailing slash in bamboo_url	Rémy Coutable	2016-04-13	1	-52/+210
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, improve specs for BambooService Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master'	Robert Speicher	2016-04-13	1	-52/+199
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix trailing slash in teamcity_url Originally opened at !2309 by @ctmay4. As described in #3515, if you have trailing spaces in the the Teamcity server name, the service will not work properly. Switching from `URI.parse` to `URI.join` fixes it so that it works with or without a trailing slash. Fixes #3515. See merge request !3679
\| * \| \|	Improve TeamcityService and its specsfix-trailing-slash-in-teamcity_url-3515	Rémy Coutable	2016-04-13	1	-52/+199
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'api-subscribe-issue-mr' into 'master'	Rémy Coutable	2016-04-13	2	-0/+85
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Subscribe and unsubscribe from issues and merge requests * Closes #6024 This MR is based on !3611, which must be merged first. See merge request !3615
\| * \| \| \|	Ensure that issues and merge requests are found	Robert Schilling	2016-04-13	2	-3/+15
\| \| \| \| \|
\| * \| \| \|	Make subscription API more RESTful	Robert Schilling	2016-04-13	2	-14/+26
\| \| \| \| \|
\| * \| \| \|	API: Ability to subscribe and unsubscribe from a merge request	Robert Schilling	2016-04-13	1	-0/+30
\| \| \| \| \|
\| * \| \| \|	API: Ability to subscribe and unsubscribe from an issue	Robert Schilling	2016-04-13	1	-0/+31
\| \| \| \| \|
* \| \| \| \|	Merge branch 'push-ref' into 'master'	Kamil Trzciński	2016-04-13	1	-4/+39
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix high CPU usage when PostReceive receives refs/merge-requests/<id> Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12661 See merge request !3651
\| * \ \ \ \	Merge branch 'master' into push-ref	Kamil Trzcinski	2016-04-13	28	-111/+672
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Fix high CPU usage when PostReceive receives refs/merge-requests/<id>push-ref	Kamil Trzcinski	2016-04-11	1	-4/+39
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'api-star-project' into 'master'	Rémy Coutable	2016-04-13	1	-0/+48
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Star and unstar a project Add two new endpoints `POST /projects/:id/star` and `POST /projects/:id/unstar` to star and unstar a project. * Closes #12739 See merge request !3578
\| * \| \| \| \| \|	Styling changes to code and docs	Robert Schilling	2016-04-13	1	-6/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make staring API more restful	Robert Schilling	2016-04-13	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	API: Star and unstar a project	Robert Schilling	2016-04-13	1	-0/+50
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'label-filter' into 'master'	Jacob Schatz	2016-04-13	1	-0/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed not being able to filter by any or no labels Brings back the options to filter by any or no label Closes #15008 ![Screen_Shot_2016-04-07_at_11.26.41](/uploads/20d949b19f537d830118532e1d44feb7/Screen_Shot_2016-04-07_at_11.26.41.png) See merge request !3589
\| * \| \| \| \| \|	Filtering by any label keeps the text on the toggle buttonlabel-filter	Phil Hughes	2016-04-12	1	-0/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added label filter tests	Phil Hughes	2016-04-07	1	-0/+22
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'external-omniauth-providers' into 'master'	Marin Jankovski	2016-04-13	1	-9/+28
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow Omniauth providers to be marked as external Related to #4009 With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login. MR for Omnibus: gitlab-org/omnibus-gitlab!727 /cc @dblessing @DouweM See merge request !3657
\| * \| \| \| \| \| \|	Added default setting for `external_providers`	Patricio Cano	2016-04-11	1	-9/+28
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-gitlab-com-check' into 'master'	Dmitriy Zaporozhets	2016-04-13	1	-0/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `Gitlab.com?` method To be used as a feature flag for GitLab.com-only features, such as welcome emails. We will be careful to only use this to disable features or functionality that do not make sense for any installations that aren't GitLab.com. We will not use this to restrict features from other installations or keep them "exclusive" to GitLab.com. See merge request !3682
\| * \| \| \| \| \| \|	Add `Gitlab.com?` methodrs-gitlab-com-check	Robert Speicher	2016-04-12	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To be used as a feature flag for GitLab.com-only features, such as welcome emails. We will be careful to only use this to disable features or functionality that do not make sense for any installations that aren't GitLab.com. We will not use this to restrict features from other installations or keep them "exclusive" to GitLab.com.
* \| \| \| \| \| \| \|	Merge branch 'api-group-leaking' into 'master'	Rémy Coutable	2016-04-13	2	-12/+19
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Return 404 if user does not have access to group Closes #15185 After !3587 is merged, I'll update this one to also fix the return code of the tests in !3587. See merge request !3683
\| * \| \| \| \| \| \|	Fix group_member_spec to not leak information	Robert Schilling	2016-04-13	1	-5/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	API: Avoid group leak while updating the group	Robert Schilling	2016-04-13	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	API: Return 404 if user does not have access to group	Robert Schilling	2016-04-13	1	-5/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'api-move-issues' into 'master'	Rémy Coutable	2016-04-13	1	-1/+69
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Ability to move an issue Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14741 See merge request !3593
\| * \| \| \| \| \| \|	Update tests for moving issues via API	Robert Schilling	2016-04-13	1	-20/+37
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	API: Ability to move an issue	Robert Schilling	2016-04-13	1	-1/+52
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Added ability to add custom tags to transactions	Yorick Peterse	2016-04-13	1	-0/+25
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	One use case for this is manually setting the "action" tag for Grape API calls. Due to Grape running blocks there are no human readable method names that can be used for the "action" tag, thus we have to set these manually on a case by case basis.
* \| \| \| \| \| \|	Merge branch 'issue_15044' into 'master'	Rémy Coutable	2016-04-13	1	-0/+28
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to close invalid merge request fixes #15044 See merge request !3664
\| * \| \| \| \| \|	Add changelog entry, improve specs and model codeissue_15044	Felipe Artur	2016-04-12	1	-5/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Allow to close invalid merge request	Felipe Artur	2016-04-11	1	-0/+29
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-stale-branch-count-cache' into 'master'	Yorick Peterse	2016-04-13	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix repository cache invalidation issue when project is recreated with an empty repo See merge request !3692
\| * \| \| \| \| \| \|	Fix repository cache invalidation issue when project is recreated with an ↵	Stan Hu	2016-04-13	1	-0/+2
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	empty repo To reproduce: 1. Create a project with some content 2. Rename the project 3. Create a new project with the same name. 4. Boom - 404. After step 2, the branch and tag counts were not being cleared. This would cause `repository.has_visible_content?` to erroneously return `true` for the newly-created project. Closes #13384
* \| \| \| \| \| \|	Merge branch 'api-group-visibility' into 'master'	Rémy Coutable	2016-04-13	1	-0/+44
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Ability to update a group This makes it much easier to update a group after introducing the group visibility. * Closes #14991 See merge request !3587
\| * \| \| \| \| \|	Fix minor issues according development guidelines	Robert Schilling	2016-04-12	1	-4/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	API: Ability to update a group	Robert Schilling	2016-04-12	1	-0/+36
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'project-title-dropdown' into 'master'	Jacob Schatz	2016-04-12	3	-24/+26
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project dropdown in header uses new dropdown See merge request !3339