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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '26051-fix-missing-endpoint-route-method' into 'master' tc-add-gitlab-flow-to-engineering	Rémy Coutable	2017-01-09	4	-3/+25
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Don't instrument 405 Grape calls Closes #26051 See merge request !8445
\| *	Don't instrument 405 Grape calls26051-fix-missing-endpoint-route-method	Rémy Coutable	2017-01-09	4	-3/+25
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #26051. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch '8-16-update-guides' into 'master'	Rémy Coutable	2017-01-09	2	-2/+239
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Added update guides for 8.16RC1 See merge request !8502
\| * \|	updated due to reorder changes [ci skip]	James Lopez	2017-01-09	1	-26/+61
\| \| \|
\| * \|	use ruby 2.3.3 also in the update guide [ci skip]	James Lopez	2017-01-09	1	-3/+3
\| \| \|
\| * \|	added update guides for 8.16 [ci skip]	James Lopez	2017-01-09	2	-2/+204
\|/ /
* \|	Merge branch '26014-fix-update-doc' into 'master'	Achilleas Pipinellis	2017-01-09	4	-49/+87
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-order update steps in the 8.14 -> 8.15 upgrade guide Closes #26014 See merge request !8287
\| * \|	Re-order update steps in the 8.14 -> 8.15 upgrade guide26014-fix-update-doc	Rémy Coutable	2017-01-09	4	-49/+87
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Gems need to be installed before we can run the gitlab:workhorse:install task 1. Update gitlab-shell after gitlab-workhorse since it's a manual step that needs to be done in `/home/git/gitlab-shell` Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'track_last_used_date_of_ssh_keys' into 'master'	Sean McGivern	2017-01-09	12	-1/+78
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Record and show last used date of SSH Keys See merge request !8113
\| * \|	Record and show last used date of SSH Keys	Vincent Wong	2017-01-09	12	-1/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Addresses: Issue #13810 1. Adds a last_used_at attribute to the Key table/model 2. Update a key's last_used_at whenever it gets used 3. Display how long ago an ssh key was last used
* \| \|	Merge branch 'fix-broken-url-on-group-avatar' into 'master'	Sean McGivern	2017-01-09	3	-1/+37
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken url on group avatar Closes #26452 See merge request !8464
\| * \|	Fix broken url on group avatar	hogewest	2017-01-06	3	-1/+37
\| \| \|
* \| \|	Merge branch 'fix-link-reply-by-email' into 'master'	Achilleas Pipinellis	2017-01-06	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix dead link in Reply by email documentation Closes #26247 See merge request !8474
\| * \| \|	Fix dead link in Reply by email documentationfix-link-reply-by-email	Achilleas Pipinellis	2017-01-06	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch '25371-environments-date-created-column-is-not-labeled' into ↵	Clement Ho	2017-01-06	2	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add label to Environments "Date Created" column Closes #25371 See merge request !8376
\| * \| \| \|	Add label to Environments "Date Created" column	Saad Shahd	2016-12-30	2	-1/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch '25985-combine-members-and-groups-settings-pages' into 'master'	Alfredo Sumaran	2017-01-06	34	-164/+218
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved the members and groups to single option called members Closes #25985 See merge request !8281
\| * \| \| \| \|	Moved the "import" button next to the "Add to project" button25985-combine-members-and-groups-settings-pages	Jose Ivan Vargas	2017-01-06	4	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed padding and margins for the dropdowns on the members section
\| * \| \| \| \|	Fixed a test and change the arrow functions to named functions	Jose Ivan Vargas	2017-01-04	2	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Added UX improvements	Jose Ivan Vargas	2017-01-03	2	-23/+21
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed es6 lint errors, and reverted a change to a helper	Jose Ivan Vargas	2017-01-03	4	-9/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Added CHANGELOG	Jose Ivan Vargas	2017-01-03	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed tests	Jose Ivan Vargas	2017-01-03	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Updated the "users" to "members" matches in the view	Jose Ivan Vargas	2017-01-03	7	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reverted the change from the "expires_at" to "expires_at_groups" in the groups controller
\| * \| \| \| \|	Updated some tests descriptions to represent the correct settings path	Jose Ivan Vargas	2017-01-03	4	-10/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated the js from the member_expiration_date to es6
\| * \| \| \| \|	Added tests for the MembersController and corrected some more tests	Jose Ivan Vargas	2017-01-03	2	-1/+15
\| \| \| \| \| \|
\| * \| \| \| \|	Removed the "Groups" option from the settings gear	Jose Ivan Vargas	2017-01-03	7	-18/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed more tests
\| * \| \| \| \|	Added groups to members section, added a members finder	Jose Ivan Vargas	2017-01-03	7	-20/+35
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed more rspec tests as well as spinach features	Jose Ivan Vargas	2017-01-03	4	-5/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed rspec tests for the project members also fixed the index	Jose Ivan Vargas	2017-01-03	10	-68/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	view (removed an extra tag )
\| * \| \| \| \|	Moved the members (project_members)option to a single controller called members	Jose Ivan Vargas	2017-01-03	14	-43/+113
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This controller is going to contain both the project members and groups options for the settings gear. Generated the route and modified the routing to point to the new members setting path
* \| \| \| \| \|	Merge branch 'support-google-cloud-storage-backups' into 'master'	Stan Hu	2017-01-06	4	-1/+51
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-add Google Cloud Storage as a backup strategy Closes #26362 See merge request !8481
\| * \| \| \| \| \|	Re-add Google Cloud Storage as a backup strategysupport-google-cloud-storage-backups	Rémy Coutable	2017-01-06	4	-1/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'ux-copy-capitalization-punctuation' into 'master'	Allison Whilden	2017-01-06	1	-14/+90
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve UX copy docs on capitalization and punctuation See merge request !8439
\| * \| \| \| \| \|	Improve UX copy docs on capitalization and punctuationux-copy-capitalization-punctuation	Pedro Moreira da Silva	2017-01-04	1	-14/+90
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fixed-failing-markdown-input-tests' into 'master'	Rémy Coutable	2017-01-06	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed failing markdown button tests See merge request !8471
\| * \| \| \| \| \| \|	Fixed failing markdown button tests	Phil Hughes	2017-01-06	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fixed-edit-form-failing-test' into 'master'	Rémy Coutable	2017-01-06	2	-3/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed edit form authenticity_token call failing the tests See merge request !8472
\| * \| \| \| \| \| \| \|	Fixed edit form authenticity_token call failing the testsfixed-edit-form-failing-test	Phil Hughes	2017-01-06	2	-3/+4
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Update CHANGELOG.md for 8.15.3	Douglas Barbosa Alexandre	2017-01-06	18	-68/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'update-gitea-importer-doc' into 'master'	Rémy Coutable	2017-01-06	1	-4/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With Gitea v1.0.0, notes are imported See merge request !8298
\| * \| \| \| \| \| \| \|	With Gitea v1.0.0, notes are importedupdate-gitea-importer-doc	Rémy Coutable	2016-12-23	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'issue-boards-animate' into 'master'	Fatih Acet	2017-01-06	5	-27/+63
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added animations to issue boards Closes #25630 See merge request !8417
\| * \| \| \| \| \| \| \| \|	Added note about width of sidebarissue-boards-animate	Phil Hughes	2017-01-06	2	-8/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed CSS transition property for only values that change
\| * \| \| \| \| \| \| \| \|	Fixed issue card not scrolling to correct position	Phil Hughes	2017-01-05	1	-1/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Added animations to issue boards	Phil Hughes	2017-01-03	5	-23/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adds animation when opening & closing the sidebar - Adds an animation when dragging boards to a new position - Adds animations to dragging issues around When opening the sidebar it will also animate the scrollLeft property to make moving to the opened issue less blunt. Closes #25630
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Alfredo Sumaran	2017-01-06	45	-106/+609
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task' into 'master' Precompile all frontend test fixtures Closes #26226 See merge request !8384
\| * \| \| \| \| \| \| \| \| \|	fix right_sidebar_spec ajax call26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task	Mike Greiling	2017-01-05	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	replace Teaspoon fixture methods with jasmine-jquery methods to reduce ↵	Mike Greiling	2017-01-05	41	-97/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dependency on Teaspoon
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'fix-u2f-fixtures' into ↵	Mike Greiling	2017-01-05	4	-23/+36
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task * fix-u2f-fixtures: generate u2f frontend fixtures dynamically force utf-8 encoding for prior to fixture parsing to prevent nokogiri issues exclude script type=text/template from dom scrubbing