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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into awardablesawardables	Z.J. van de Weg	2016-06-03	8	-34/+42
\|\
\| *	Fix more tests with new Code tab	Dmitriy Zaporozhets	2016-06-03	4	-13/+15
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Update tests to match new Code tab logic	Dmitriy Zaporozhets	2016-06-03	3	-24/+25
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Refactor. Add tests.	Josh Frye	2016-06-02	2	-0/+5
\| \|
\| *	Enable Style/SpaceAfterMethodName rubocop coprubocop/enable-space-after-method-name-cop	Grzegorz Bizon	2016-05-30	1	-1/+1
\| \| \| \| \| \| \| \|	See #17478
* \|	Incorportate feedback	Z.J. van de Weg	2016-06-01	1	-1/+1
\| \|
* \|	Merge branch 'master' into awardables	ZJ van de Weg	2016-05-30	9	-16/+16
\|\ \ \| \|/
\| *	Improve note factory	Grzegorz Bizon	2016-05-29	1	-1/+1
\| \|
\| *	Update specs to carry out changes in note factory	Grzegorz Bizon	2016-05-29	2	-2/+2
\| \|
\| *	Merge branch 'updated-contrib-calendar' into 'master'	Jacob Schatz	2016-05-25	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	POC: Updated contrib calendar In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it? ![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png) cc. @jschatz1 See merge request !3944
\| \| *	tests update	Phil Hughes	2016-05-16	1	-1/+1
\| \| \|
\| * \|	Merge branch 'fix-grammar-issues' into 'master'	Jacob Schatz	2016-05-25	1	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammar and wording in text on various pages. ## What does this MR do? Fixes various grammatical and/or wording issues I found while copyediting on the plane :) ## Why was this MR needed? Incorrect grammar and weird/confusing wording makes the product look less polished and professional. See merge request !4237
\| \| * \|	Fix grammar and wording in text on various pages.	Connor Shea	2016-05-22	1	-2/+2
\| \| \| \|
\| * \| \|	Merge branch 'rs-rubocop-nottonot' into 'master'	Dmitriy Zaporozhets	2016-05-25	7	-10/+10
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable RSpec/NotToNot cop and auto-correct offenses Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17761 See merge request !4267
\| \| * \| \|	Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonot	Robert Speicher	2016-05-24	7	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also removes the note from the development/testing.md guide
* \| \| \| \|	Remove old tests, and use right factories	ZJ van de Weg	2016-05-25	2	-9/+9
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into awardables	ZJ van de Weg	2016-05-25	23	-103/+103
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'snippets-ui' into 'master'	Jacob Schatz	2016-05-24	2	-4/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated snippets UI ![Screen_Shot_2016-05-18_at_14.11.54](/uploads/2544351e50f19a36c4ba9a7a92d5544b/Screen_Shot_2016-05-18_at_14.11.54.png) Closes #14328 See merge request !4194
\| \| * \| \| \|	Updated snippets testssnippets-ui	Phil Hughes	2016-05-19	2	-4/+4
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch 'project-settings' into 'master'	Jacob Schatz	2016-05-24	1	-1/+1
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project settings UI update ![Screen_Shot_2016-05-16_at_16.42.55](/uploads/2e308cbf26a002fc411c3e84b663a5d1/Screen_Shot_2016-05-16_at_16.42.55.png)![Screen_Shot_2016-05-16_at_16.43.01](/uploads/8d983c43307c65852efe002f6e9482d9/Screen_Shot_2016-05-16_at_16.43.01.png)![Screen_Shot_2016-05-16_at_16.43.16](/uploads/6124e0600cc0e5b309a60b065409d537/Screen_Shot_2016-05-16_at_16.43.16.png)![Screen_Shot_2016-05-16_at_16.43.13](/uploads/177976c2c08034e096e7ebdcad1f369f/Screen_Shot_2016-05-16_at_16.43.13.png) See merge request !4162
\| \| * \| \|	Fixed project settings testsproject-settings	Phil Hughes	2016-05-20	1	-1/+1
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'master' into project-navigation-redesign	Dmitriy Zaporozhets	2016-05-23	3	-4/+4
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Fix spinach tests	Kamil Trzcinski	2016-05-16	1	-2/+2
\| \| \| \|
\| \| * \|	Merge remote-tracking branch 'origin/master' into with-pipeline-view	Kamil Trzcinski	2016-05-16	1	-6/+6
\| \| \|\ \ \| \| \| \|/
\| \| * \|	Fix spinach tests	Kamil Trzcinski	2016-05-14	2	-2/+2
\| \| \| \|
\| * \| \|	Fix file browsing test	Dmitriy Zaporozhets	2016-05-16	1	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Fix shortcuts tests	Dmitriy Zaporozhets	2016-05-16	3	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Modify tests to match new navigation behaviour for project pages	Dmitriy Zaporozhets	2016-05-16	14	-86/+82
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables	Fatih Acet	2016-05-18	5	-10/+10
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
\| * \|	Update specs	Douwe Maan	2016-05-13	1	-6/+6
\| \|/
\| *	Codestyle: make sure we have space around operators	Gabriel Mazetto	2016-05-13	4	-4/+4
\| \|
* \|	Merge branch 'master' into awardables	Zeger-Jan van de Weg	2016-05-11	1	-1/+1
\|\ \ \| \|/
\| *	Merge branch 'hook-docs-behavior' into 'master'	Robert Speicher	2016-05-11	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve documentation and web test for web hooks Tips and documentation of actual hook behavior. Improved user feedback when testing hooks via the web UI. See merge request !4015
\| \| *	Fix test failures	Jacob Vosmaer	2016-05-09	1	-1/+1
\| \| \|
* \| \|	Merge branch 'master' into awardables	Zeger-Jan van de Weg	2016-05-11	25	-225/+49
\|\ \ \ \| \|/ /
\| * \|	Add integration specs for tags	Rémy Coutable	2016-05-10	2	-136/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Merge branch 'rs-backport-ee-372' into 'master'	Rémy Coutable	2016-05-09	2	-39/+3
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes from gitlab-org/gitlab-ee!372 Mostly replaces several Spinach tests with RSpec Feature tests. See merge request !4043
\| \| * \|	Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372	Robert Speicher	2016-05-04	2	-39/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mostly replaces several Spinach tests with RSpec Feature tests.
\| * \| \|	Merge branch 'master' into group-navigation-redesign	Dmitriy Zaporozhets	2016-05-05	2	-4/+4
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge branch 'clean-user-profile-classes' into 'master'	Jacob Schatz	2016-05-04	1	-1/+1
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused .contributed-projects class While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector. See merge request !3945
\| \| \| * \|	Remove unused .contributed-projects class	Karlo Soriano	2016-04-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector.
\| \| * \| \|	Merge branch 'use-rugged-to-create-tag' into 'master'	Rémy Coutable	2016-05-04	1	-2/+2
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request. Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too. See merge request !3745
\| \| \| * \| \|	Use Rugged's TagCollection#create instead of gitlab-shell's ↵	Rémy Coutable	2016-05-04	1	-2/+2
\| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Repository#add_tag for better performance Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \|	Merge branch 'fix-typo-in-user-steps' into 'master'	Rémy Coutable	2016-05-04	1	-1/+1
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in user steps feature file Just came across a typo in the user steps file. See merge request !3943
\| \| \| * \|	Fix typo in user steps feature	Karlo Soriano	2016-04-27	1	-1/+1
\| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Remove go to dashboard test suite for group page and get rid of AR warning	Dmitriy Zaporozhets	2016-05-03	3	-10/+4
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Merge branch 'project-webhooks-ui' into 'master'	Jacob Schatz	2016-04-28	1	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project webhooks updated UI Closes #13993 ![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png) ![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png) See merge request !3922
\| \| * \|	Updated testsproject-webhooks-ui	Phil Hughes	2016-04-26	1	-2/+2
\| \| \| \|
\| * \| \|	Merge branch 'project-deploy-keys-ui' into 'master'	Jacob Schatz	2016-04-28	2	-8/+7
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project deploy keys updated UI Closes #13992 See merge request !3912
\| \| * \|	Updated tests for deploy keysproject-deploy-keys-ui	Phil Hughes	2016-04-25	2	-8/+7
\| \| \|/