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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Wait for AJAX after steps defined in SharedActiveTab31439-fix-transient-spinach-failures	Rémy Coutable	2017-04-26	1	-0/+5
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'dz-bump-gitlab-shell' into 'master'	Douwe Maan	2017-04-25	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Bump gitlab-shell version to 5.0.3 See merge request !10922
\| *	Bump gitlab-shell version to 5.0.3	Dmitriy Zaporozhets	2017-04-25	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch ↵	Robert Speicher	2017-04-25	4	-52/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'30692-document-rspec-profile-and-mysql-branch-testing-and-remove-ci_setup-doc-page' into 'master' Remove outdated ci_setup.md doc page and document MySQL and RSpec profiling for specific branches Closes #30692 See merge request !10916
\| * \|	Remove outdated ci_setup.md doc page and document MySQL and RSpec profiling ↵30692-document-rspec-profile-and-mysql-branch-testing-and-remove-ci_setup-doc-page	Rémy Coutable	2017-04-25	4	-52/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for specific branches Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'update-mr-diff-blob-fork-suggestion-after-jquery-udpate' into ↵	Stan Hu	2017-04-25	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Update MR diff blob_fork_suggestion after jQuery update See merge request !10921
\| * \| \|	Update MR diff blob_fork_suggestion after jQuery updateupdate-mr-diff-blob-fork-suggestion-after-jquery-udpate	Eric Eastwood	2017-04-25	1	-1/+2
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`.init()` was added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10858 We need to add it the MR diff instance that was added in a separate MR and of course didn't add a conflict because it is a completely different piece
* \| \|	Merge branch 'metrics-graph-error-fix' into 'master'	Phil Hughes	2017-04-25	2	-29/+38
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Metrics graph error fix Closes #30840 See merge request !10839
\| * \| \|	Metrics graph error fix	Jose Ivan Vargas Lopez	2017-04-25	2	-29/+38
\|/ / /
* \| \|	Merge branch 'mr-diff-size-overflow' into 'master'	Douwe Maan	2017-04-25	6	-27/+52
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show correct size when MR diff overflows Closes #26560 See merge request !10827
\| * \|	Show correct size when MR diff overflows	Sean McGivern	2017-04-25	6	-27/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The problem is that we often go via a diff object constructed from the diffs stored in the DB. Those diffs, by definition, don't overflow, so we don't have access to the 'correct' `real_size` - that is stored on the MR diff object iself.
* \| \|	Merge branch '27827-cleanup-markdown' into 'master'	Phil Hughes	2017-04-25	12	-38/+48
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Clean up padding with Markdown headers" Closes #27827 See merge request !10350
\| * \| \|	Resolve "Clean up padding with Markdown headers"	Taurie Davis	2017-04-25	12	-38/+48
\|/ / /
* \| \|	Merge branch 'sh-bump-sidekiq-version' into 'master'	Robert Speicher	2017-04-25	2	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Sidekiq to 4.2.10 See merge request !10899
\| * \| \|	Upgrade Sidekiq to 4.2.10sh-bump-sidekiq-version	Stan Hu	2017-04-24	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://github.com/mperham/sidekiq/blob/master/Changes.md#4210
* \| \| \|	Merge branch '31174-project-integration-service-sub-nav' into 'master'	Alfredo Sumaran	2017-04-25	4	-2/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add sub-nav for Project Integration Services edit page Closes #31174 See merge request !10813
\| * \| \| \|	Add sub-nav for Project Integration Services edit page	Kushal Pandya	2017-04-25	4	-2/+7
\|/ / / /
* \| \| \|	Merge branch 'dm-fix-oauth-user-creation' into 'master'	Robert Speicher	2017-04-25	7	-5/+47
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled Closes #31294 See merge request !10896
\| * \| \| \|	Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creation	Douwe Maan	2017-04-24	7	-5/+47
\| \|/ / /
* \| \| \|	Merge branch 'fix/web_hooks-index' into 'master'	Douwe Maan	2017-04-25	3	-1/+21
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index to webhooks type column Closes #31232 See merge request !10883
\| * \| \|	Add index to webhooks type column	James Lopez	2017-04-25	3	-1/+21
\|/ / /
* \| \|	Merge branch 'ignore-all-builds-dirs' into 'master'	Rémy Coutable	2017-04-25	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore all builds* directories from version control See merge request !10903
\| * \| \|	Ignore all builds* directories from version controlignore-all-builds-dirs	Achilleas Pipinellis	2017-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The restore process copies the old builds/ dir into builds.<epoch>/ which results in Git complaining about untracked files
* \| \| \|	Merge branch '31276-fix-diffs-with-edit-forking-needs' into 'master'	Douwe Maan	2017-04-25	6	-21/+64
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diffs with edit-forking needs Closes #31276 See merge request !10868
\| * \| \| \|	Fix diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needs	Eric Eastwood	2017-04-24	6	-21/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276
* \| \| \| \|	Merge branch 'fix-usage-ping-doc-link' into 'master'	Rémy Coutable	2017-04-25	2	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix usage ping docs link from empty cohorts page See merge request !10907
\| * \| \| \| \|	Fix usage ping docs link from empty cohorts pagefix-usage-ping-doc-link	Sean McGivern	2017-04-25	2	-1/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-17' into 'master'	Rémy Coutable	2017-04-25	1	-8/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update markdown.md See merge request !10776
\| * \| \| \| \| \|	Update markdown.md	Simon Hardt	2017-04-25	1	-8/+10
\|/ / / / / /
* \| \| \| \| \|	Merge branch '21683-show-created-group-name-flash' into 'master'	Sean McGivern	2017-04-25	2	-1/+5
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show group name on flash container when group is created from Admin area Closes #21683 See merge request !10905
\| * \| \| \| \|	Show group name on flash container when group is created from Admin area	Kushal Pandya	2017-04-25	2	-1/+5
\|/ / / / /
* \| \| \| \|	Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master'	Sean McGivern	2017-04-25	12	-23/+27
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't display the `is_admin?` flag for user API responses Closes #29903 See merge request !10846
\| * \| \| \| \|	Update documentation to reflect the removal of `is_admin` from most API ↵	Timothy Andrew	2017-04-25	4	-14/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	responses.
\| * \| \| \| \|	Add changelog entry for !10846	Timothy Andrew	2017-04-25	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Don't display the `is_admin?` flag for user API responses.	Timothy Andrew	2017-04-25	7	-9/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- To prevent an attacker from enumerating the `/users` API to get a list of all the admins. - Display the `is_admin?` flag wherever we display the `private_token` - at the moment, there are two instances: - When an admin uses `sudo` to view the `/user` endpoint - When logging in using the `/session` endpoint
* \| \| \| \| \|	Merge branch 'master' into 'master'	Rémy Coutable	2017-04-25	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in discussions doc. See merge request !10889
\| * \| \| \| \| \|	Fix typo in discussions doc.	Marland Sitt	2017-04-24	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '30649-update-health-check-documentation' into 'master'	Achilleas Pipinellis	2017-04-25	1	-17/+59
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Health Check Documentation Closes #30649 See merge request !10565
\| * \| \| \| \| \|	Add Health Check Documentation	Joshua Lambert	2017-04-25	1	-17/+59
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'gitaly-testing-toml' into 'master'	Rémy Coutable	2017-04-25	3	-6/+42
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitaly testing toml Closes gitaly#182 See merge request !10605
\| * \| \| \| \|	Configure Gitaly through settings file instead of ENV varsgitaly-testing-toml	Alejandro Rodríguez	2017-04-18	3	-6/+42
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-fix-spinach-5-10-tests' into 'master'	Robert Speicher	2017-04-24	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix scoping issues with Spinach tests See merge request !10895
\| * \| \| \| \| \|	Fix scoping issues with Spinach tests (e.g. ↵sh-fix-spinach-5-10-tests	Stan Hu	2017-04-24	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/builds/14929499)
* \| \| \| \| \|	Merge branch 'vue-experts' into 'master'	Jacob Schatz	2017-04-24	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove names from docs and add vue experts instead See merge request !10817
\| * \| \| \| \| \|	Remove names from docs and add vue experts insteadvue-experts	Filipa Lacerda	2017-04-20	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'use-jquery-on-blob-fork-suggestion' into 'master'	Jacob Schatz	2017-04-24	3	-44/+43
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use jQuery niceness on blob_fork_suggestion See merge request !10858
\| * \| \| \| \| \| \|	Use jQuery niceness on blob_fork_suggestionuse-jquery-on-blob-fork-suggestion	Eric Eastwood	2017-04-22	3	-44/+43
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10602#note_27871752
* \| \| \| \| \| \|	Merge branch 'add-aria-to-icon' into 'master'	Jacob Schatz	2017-04-24	3	-0/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add aria to icon See merge request !10670
\| * \| \| \| \| \| \|	Update changelog	Clement Ho	2017-04-24	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improve specsadd-aria-to-icon	Clement Ho	2017-04-24	1	-1/+3
\| \| \| \| \| \| \| \|