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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix bad code example29326-update-documentation	Filipa Lacerda	2017-03-13	1	-2/+2
\|
*	Merge branch 'master' into 29326-update-documentation	Filipa Lacerda	2017-03-13	12	-47/+54
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Resolve transient failure in spec/models/user_spec.rb Execute inflections initializer earlier Fix alignment of resolve discussion button Update templates with new CI variables Fix inconsistent deploy key documentation in UI
\| *	Merge branch '29189-discussion-button' into 'master'	Filipa Lacerda	2017-03-13	3	-15/+17
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix alignment of resolve discussion button Closes #29189 See merge request !9865
\| \| *	Fix alignment of resolve discussion button29189-discussion-button	Annabel Dunstone Gray	2017-03-10	3	-15/+17
\| \| \|
\| * \|	Merge branch '29328-fix-transient-failure-in-model-user-spec' into 'master'	Rémy Coutable	2017-03-13	2	-2/+7
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve transient failure in spec/models/user_spec.rb Closes #29328 See merge request !9892
\| \| * \|	Resolve transient failure in spec/models/user_spec.rb	George Andrinopoulos	2017-03-13	2	-2/+7
\| \|/ /
\| * \|	Merge branch 'mrchrisw-update-deploy-key' into 'master'	Filipa Lacerda	2017-03-13	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inconsistent deploy key documentation in UI See merge request !9817
\| \| * \|	Fix inconsistent deploy key documentation in UImrchrisw-update-deploy-key	Chris Wilson	2017-03-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deploy keys were added with write access to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383 - We still state " Deploy keys allow read-only access to your repository." in the UI. This updates the deploy key UI information to reflect the docs https://docs.gitlab.com/ce/ssh/README.html#deploy-keys
\| * \| \|	Merge branch 'zj-update-templates' into 'master'	James Lopez	2017-03-13	5	-29/+29
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update templates with new CI variables See merge request !9852
\| \| * \| \|	Update templates with new CI variableszj-update-templates	Z.J. van de Weg	2017-03-10	5	-29/+29
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fix/execute-inflections-initializer-early' into 'master'	DJ Mountney	2017-03-11	1	-0/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Execute inflections initializer earlier See merge request !9871
\| \| * \| \| \|	Execute inflections initializer earlierfix/execute-inflections-initializer-early	Douglas Barbosa Alexandre	2017-03-10	1	-0/+0
\| \| \| \|_\|/ \| \| \|/\| \|
* \| \| \| \|	Fix code examples and add code highligth	Filipa Lacerda	2017-03-10	1	-5/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into 29326-update-documentation	Filipa Lacerda	2017-03-10	8	-56/+166
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Using guard clause and added more specs Changelog Fix GitHub Import for open PRs from a fork Add frequently used emojis back to awards menu
\| * \| \| \|	Merge branch '29046-fix-github-importer-open-prs' into 'master'	Douwe Maan	2017-03-10	5	-33/+105
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix GitHub Import deleting branches for open PRs from a fork Closes #29046 See merge request !9758
\| \| * \| \| \|	Using guard clause and added more specs29046-fix-github-importer-open-prs	Gabriel Mazetto	2017-03-10	4	-58/+90
\| \| \| \| \| \|
\| \| * \| \| \|	Changelog	Gabriel Mazetto	2017-03-10	1	-0/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Fix GitHub Import for open PRs from a fork	Gabriel Mazetto	2017-03-10	3	-1/+37
\| \| \|/ / /
\| * \| \| \|	Merge branch 'add-frequently-used-emojis-back-to-menu' into 'master'	Filipa Lacerda	2017-03-10	3	-23/+61
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Add frequently used emojis back to awards menu See merge request !9843
\| \| * \| \|	Add frequently used emojis back to awards menuadd-frequently-used-emojis-back-to-menu	Eric Eastwood	2017-03-09	3	-23/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thanks @filipa for the shout`
* \| \| \| \|	Adds best practices regarding context and vue to documentation	Filipa Lacerda	2017-03-10	1	-1/+32
\|/ / / /
* \| \| \|	Merge branch 'fix-500-in-notes-polling' into 'master'	Rémy Coutable	2017-03-10	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix notes polling failing after code changes Closes #29327 See merge request !9862
\| * \| \| \|	Fix notes polling failing after code changes	Sean McGivern	2017-03-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9235
* \| \| \| \|	Merge branch '29263-merge-button-color' into 'master' 29326-how-to-vue-architectural-decisions	Annabel Dunstone Gray	2017-03-10	3	-5/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Consistent button colors for disabled buttons Closes #29263 and #29221 See merge request !9848
\| * \| \| \| \|	Consistent button colors for disabled buttons29263-merge-button-color	Simon Knox	2017-03-10	3	-5/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '29137-bulk-perform-async-should-specify-queue' into 'master'	Douwe Maan	2017-03-10	3	-6/+25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	adds queue option to push bulk in authorized projects worker Closes #29137 See merge request !9813
\| * \| \| \| \| \|	adds queue option to push bulk in authorized projects worker29137-bulk-perform-async-should-specify-queue	Tiago Botelho	2017-03-10	3	-6/+25
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'enable-snippets-by-default' into 'master'	Douwe Maan	2017-03-10	3	-2/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable snippets for new projects by default Closes #28192 See merge request !9857
\| * \| \| \| \| \|	Enable snippets for new projects by defaultenable-snippets-by-default	Sean McGivern	2017-03-10	3	-2/+6
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If there is an existing gitlab.yml file with snippets explicitly disabled, they won't be enabled with this change.
* \| \| \| \| \|	Merge branch 'tc-fix-project-create-500' into 'master'	Douwe Maan	2017-03-10	4	-0/+22
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for creating a project through API when import_url is nil Closes #29121 See merge request !9841
\| * \| \| \| \| \|	Fix for creating a project through API when import_url is niltc-fix-project-create-500	Toon Claes	2017-03-10	4	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The API was returning 500 when `nil` is passed for the `import_url`. In fact, it was `Gitlab::UrlSanitizer.valid?` which was throwing a `NoMethodError` when `nil` value was passed.
* \| \| \| \| \| \|	Merge branch '28307-update-projects-edit-feature-spec' into 'master'	Rémy Coutable	2017-03-10	1	-19/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update feature visibility spec for projects edit page See merge request !9787
\| * \| \| \| \| \| \|	Update feature visibility spec for projects edit page	David Piegza	2017-03-09	1	-19/+11
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'gitaly-config' into 'master'	Sean McGivern	2017-03-10	1	-0/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document gitaly.socket_path setting See merge request !9858
\| * \| \| \| \| \| \|	Document gitaly.socket_path setting	Jacob Vosmaer	2017-03-10	1	-0/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'adam-prevent-two-issue-trackers' into 'master'	Sean McGivern	2017-03-10	4	-1/+49
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent more than one issue tracker to be active for the same project Closes #22797 See merge request !9669
\| * \| \| \| \| \| \| \|	Prevent more than one issue tracker to be active for the same project	Luis Del Giudice	2017-03-10	4	-1/+49
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '29316-can-t-select-a-mirror-user' into 'master'	Sean McGivern	2017-03-10	1	-2/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Can't select a mirror user" See merge request !9854
\| * \| \| \| \| \| \| \|	Fix autocomplete in EE when permissions are sent29316-can-t-select-a-mirror-user	Sean McGivern	2017-03-10	1	-2/+1
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In EE, `@users` can be an array at the point where we remove the current user, because it can do a permissions check on the users for project mirroring. Fix this in CE by only using array methods, not AR methods. We can't use `delete` because that uses `Object#equal?`, which isn't true in this case.
* \| \| \| \| \| \| \|	Merge branch '29209-sign-up-form-name' into 'master'	Annabel Dunstone Gray	2017-03-10	2	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change label for name on sign up form Closes #29209 See merge request !9845
\| * \| \| \| \| \| \| \|	Change label for name on sign up form29209-sign-up-form-name	tauriedavis	2017-03-09	2	-1/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs/pages-unzip-dep' into 'master'	Achilleas Pipinellis	2017-03-10	1	-8/+12
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add zip/unzip as dependencies for Pages source installations Closes #28440 See merge request !9828
\| * \| \| \| \| \| \| \|	Add zip/unzip as dependencies for Pages source installationsdocs/pages-unzip-dep	Achilleas Pipinellis	2017-03-09	1	-8/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'docs/contributing-md-labels' into 'master'	Achilleas Pipinellis	2017-03-10	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a section on issue/MR labeling in CONTRIBUTING.md Closes #25097 See merge request !9850
\| * \| \| \| \| \| \| \|	Add a section on issue/MR labeling in CONTRIBUTING.mddocs/contributing-md-labels	Achilleas Pipinellis	2017-03-10	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25097 [ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'fe-arch-step' into 'master'	Jacob Schatz	2017-03-10	1	-2/+20
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds information about architecture step. See merge request !9844
\| * \| \| \| \| \| \| \| \|	Adds information about architecture step.	Filipa Lacerda	2017-03-10	1	-2/+20
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '24166-close-builds-dropdown' into 'master'	Clement Ho	2017-03-10	5	-80/+122
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent dropdown from closing when user clicks in a build. Closes #24166 See merge request !9834
\| * \| \| \| \| \| \| \|	Updates test to use html tags24166-close-builds-dropdown	Filipa Lacerda	2017-03-09	1	-1/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Target all build links inside a dropdown. Use jQuery to handle event delegation.	Filipa Lacerda	2017-03-09	2	-4/+8
\| \| \| \| \| \| \| \| \|