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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'notification-dropdown-labels' into 'master'	Jacob Schatz	2016-06-07	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notifications dropdown on project page now has descriptions ## What does this MR do? Adds descriptions to the notification settings dropdown on project pages. Also changed the order of them to make more sense. ## What are the relevant issue numbers? Part of #12758 ## Screenshots (if relevant) ![Screen_Shot_2016-05-31_at_09.35.24](/uploads/b30d82701a13ec15f672139e1225acf5/Screen_Shot_2016-05-31_at_09.35.24.png) See merge request !4374
\| *	Fixed failing tests	Phil Hughes	2016-06-07	1	-1/+1
\| \|
* \|	Merge branch '18013-compact-sidebar' into 'master'	Jacob Schatz	2016-06-07	1	-2/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement compact side nav ## What does this MR do? Implements new compact nav design Note- new navbar icons are in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4268) ## What are the relevant issue numbers? Closes #18013 ## Screenshots (if relevant) ![Screen_Shot_2016-06-02_at_3.20.37_PM](/uploads/d31bd17ae47743f1a20d7429b4396e84/Screen_Shot_2016-06-02_at_3.20.37_PM.png) ![Screen_Shot_2016-06-02_at_3.20.43_PM](/uploads/d03a080a57707b6a2161127f3904fcd5/Screen_Shot_2016-06-02_at_3.20.43_PM.png) cc @dzaporozhets See merge request !4447
\| * \|	Remove todos count tests in nav	Annabel Dunstone	2016-06-07	1	-2/+0
\| \|/
* \|	Merge branch 'issue_14189' into 'master'	Jacob Schatz	2016-06-07	1	-5/+5
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Ability to prioritize labels Closes #14189 See merge request !4009
\| *	Fix failing tests	Alfredo Sumaran	2016-06-06	1	-5/+5
\| \|
* \|	Merge branch 'knapsack' into 'master'	Douwe Maan	2016-06-07	1	-0/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Knapsack to evenly distribute specs Try to distribute all tests evenly accross all nodes to reduce the testing time of GitLab CE. This uses high amount of auto-scaled machines. See merge request !4240
\| * \	Merge remote-tracking branch 'origin/master' into knapsack	Kamil Trzcinski	2016-06-07	6	-37/+12
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # .gitlab-ci.yml
\| * \| \|	Use knapsack everywhere	Kamil Trzcinski	2016-06-03	1	-1/+1
\| \| \| \|
\| * \| \|	Use own version of knapsack which supports spinach tests	Kamil Trzcinski	2016-06-03	1	-1/+3
\| \| \| \|
\| * \| \|	WIP	Kamil Trzcinski	2016-06-03	1	-2/+0
\| \| \| \|
\| * \| \|	Try to use knapsack	Kamil Trzcinski	2016-06-03	1	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-format	Jacob Vosmaer (GitLab)	2016-06-07	1	-12/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Workhorse to serve raw diffs Fixes (partially) #13999 Dependent on: gitlab-org/gitlab-workhorse!45 See merge request !4130
\| * \| \| \|	Workhorse to serve raw diffs	Zeger-Jan van de Weg	2016-06-03	1	-12/+0
\| \|/ / /
* \| \| \|	Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2	Kamil Trzcinski	2016-06-07	3	-25/+0
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttons	Alejandro Rodríguez	2016-06-06	3	-25/+0
\| \| \|/ \| \|/\| \| \| \| \| \| \|	The buttons were rarely used and added at least 1 query each on every page load.
* \| \|	Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2	Kamil Trzcinski	2016-06-06	3	-12/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # features/steps/shared/builds.rb # spec/requests/ci/api/builds_spec.rb
\| * \ \	Merge remote-tracking branch 'origin/master' into rename-ci-commit	Kamil Trzcinski	2016-06-06	3	-12/+12
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Ensure we are clicking a visible dropdown	Alfredo Sumaran	2016-06-03	1	-1/+1
\| \| \| \|
\| \| * \|	Merge branch 'master' into awardablesawardables	Z.J. van de Weg	2016-06-03	8	-34/+42
\| \| \|\ \ \| \| \| \|/
\| \| * \|	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
\| \| \|\ \
\| \| * \| \|	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 '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
\| \| * \ \ \ \	Merge branch 'master' into awardables	Zeger-Jan van de Weg	2016-05-11	1	-1/+1
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'master' into awardables	Zeger-Jan van de Weg	2016-05-11	25	-225/+49
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Add tests on Awardables and Award Emoji	Zeger-Jan van de Weg	2016-05-10	2	-10/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix tests offenses: use `pipeline` of Ci::Build and rename views	Kamil Trzcinski	2016-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features	Kamil Trzcinski	2016-06-03	4	-8/+8
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into rename-ci-commit	Kamil Trzcinski	2016-06-03	7	-33/+41
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Rename Ci::Build commit to pipeline	Kamil Trzcinski	2016-06-03	3	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipeline	Kamil Trzcinski	2016-06-02	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Enable Style/SpaceAfterMethodName rubocop coprubocop/enable-space-after-method-name-cop	Grzegorz Bizon	2016-05-30	1	-1/+1
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See #17478
* \| \| \| \| \|	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
* \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \| \|/ / / / /