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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Projects on group page should be sorted by last activity instead of ↵fix-group-projects-sort	Dmitriy Zaporozhets	2016-04-14	1	-0/+1
\| \| \| \| \| \|	id/created_at Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'label-filter' into 'master'	Jacob Schatz	2016-04-13	3	-2/+33
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1/+10
\| \|
\| *	Added label filter tests	Phil Hughes	2016-04-07	1	-0/+22
\| \|
\| *	Fixed issue with any label & no label filters missing	Phil Hughes	2016-04-07	1	-1/+1
\| \| \| \| \| \| \| \|	Closes #15008
* \|	Merge branch 'external-omniauth-providers' into 'master'	Marin Jankovski	2016-04-13	6	-9/+70
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Better control flow.external-omniauth-providers	Patricio Cano	2016-04-11	1	-6/+4
\| \| \|
\| * \|	Added CHANGELOG item	Patricio Cano	2016-04-11	1	-0/+1
\| \| \|
\| * \|	Documentation of feature	Patricio Cano	2016-04-11	2	-0/+30
\| \| \|
\| * \|	Added default setting for `external_providers`	Patricio Cano	2016-04-11	1	-9/+28
\| \| \|
\| * \|	Allow `external_providers` for Omniauth to be defined to mark these users as ↵	Patricio Cano	2016-04-11	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \|	external
* \| \|	Merge branch 'rs-archive-cache-worker-cron' into 'master'	Dmitriy Zaporozhets	2016-04-13	4	-2/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663
\| * \| \|	Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cron	Robert Speicher	2016-04-12	4	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15105
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-04-13	118	-481/+4246
\|\ \ \ \
\| * \ \ \	Merge branch 'rs-gitlab-com-check' into 'master'	Dmitriy Zaporozhets	2016-04-13	2	-0/+20
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-14/+21
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-7/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'api-move-issues' into 'master'	Rémy Coutable	2016-04-13	4	-1/+148
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Ability to move an issue Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14741 See merge request !3593
\| \| * \| \| \| \| \|	Fix doc for moving an issue	Robert Schilling	2016-04-13	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Update tests for moving issues via API	Robert Schilling	2016-04-13	4	-30/+51
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	API: Ability to move an issue	Robert Schilling	2016-04-13	4	-1/+127
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'patch-2' into 'master'	Robert Schilling	2016-04-13	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	improve formatting See merge request !3688
\| \| * \| \| \| \| \| \|	improve formatting	Ben Bodenmiller	2016-04-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'custom-transaction-tags' into 'master'	Rémy Coutable	2016-04-13	3	-0/+36
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added ability to add custom tags to transactions cc @pcarranza See merge request !3674
\| \| * \| \| \| \| \| \| \|	Added ability to add custom tags to transactions	Yorick Peterse	2016-04-13	3	-0/+36
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'configure_trusted_proxies' into 'master'	Rémy Coutable	2016-04-13	5	-0/+24
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust the default trusted_proxies to only include localhost And also allow other trusted proxies to be added from the config.yml. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538 Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208 See merge request !3524
\| \| * \| \| \| \| \| \| \|	Updated trusted proxies doc section to link to the restart GitLab docsconfigure_trusted_proxies	DJ Mountney	2016-04-12	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add changelog entries, install docs, and gitlab.yml.example entry for the ↵	DJ Mountney	2016-04-12	3	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	trusted_proxies setting
\| \| * \| \| \| \| \| \| \|	Adjust the default trusted_proxies to only include localhost, and allow ↵	DJ Mountney	2016-04-12	2	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	other trusted proxies to be configured.
\| * \| \| \| \| \| \| \| \|	Merge branch 'jira_docs' into 'master'	Achilleas Pipinellis	2016-04-13	2	-5/+17
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tie example config to JIRA screenshot Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203 See merge request !3693
\| \| * \| \| \| \| \| \| \|	Tie example config to JIRA screenshot	Achilleas Pipinellis	2016-04-13	2	-5/+17
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203
\| * \| \| \| \| \| \| \|	Merge branch 'issue_15044' into 'master'	Rémy Coutable	2016-04-13	4	-6/+37
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-14/+9
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Allow to close invalid merge request	Felipe Artur	2016-04-11	3	-5/+41
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'docs-new-branch-button-3886' into 'master'	Achilleas Pipinellis	2016-04-13	2	-0/+32
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs for the new branch button [ci-skip] Closes #3886 @axil Could you check this and make sure this is up to your standards? See merge request !3425
\| \| * \| \| \| \| \| \| \|	Move 'New branch from issue' feature doc to web_editor.md	Achilleas Pipinellis	2016-04-13	3	-9/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \| \|	Docs for the new branch buttondocs-new-branch-button-3886	Zeger-Jan van de Weg	2016-03-28	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci-skip]
\| * \| \| \| \| \| \| \| \|	Merge branch 'fix-stale-branch-count-cache' into 'master'	Yorick Peterse	2016-04-13	3	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-0/+5
\| \| \| \|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-2/+152
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-11/+17
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	API: Ability to update a group	Robert Schilling	2016-04-12	4	-2/+146
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'notes-input' into 'master'	Jacob Schatz	2016-04-12	3	-5/+36
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wrap text in notes box if longer than code in diff * Fixes branch name overflow * Text and inline `code` wraps in comments * `code` blocks scroll horizontally ![Screen_Shot_2016-04-11_at_4.59.15_PM](/uploads/39eee7d35ea79d1a3944aa6281b72121/Screen_Shot_2016-04-11_at_4.59.15_PM.png) See merge request !3626
\| \| * \| \| \| \| \| \| \| \|	Remove max-width from commentsnotes-input	Annabel Dunstone	2016-04-12	2	-14/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Input updates	Annabel Dunstone	2016-04-12	3	-5/+49
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Wrap text in notes box if longer than code in diff	Annabel Dunstone	2016-04-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'fix-todo-target-path' into 'master'	Robert Speicher	2016-04-12	2	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix todo_target_path for todos where target was removed Fixes #15187 See merge request !3684