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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Docs permissions for group labelsgroup-label-permissions-docs	Victor Wu	2017-06-19	1	-0/+1
\|
*	Merge branch 'add-since-and-until-params-to-issuables' into 'master'	Rémy Coutable	2017-06-19	8	-3/+87
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	add created_after and created_before params to issuables Closes #32901 See merge request !12151
\| *	add since and until params to issuables	Kyle Bishop	2017-06-18	8	-3/+87
\| \|
* \|	Merge branch '33461-display-user-id' into 'master'	Grzegorz Bizon	2017-06-19	3	-4/+34
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display own user id in account settings pages Closes #33461 See merge request !12141
\| * \|	Update test to use single quotes and Four-Phase test conventions	Riccardo Padovani	2017-06-15	1	-2/+3
\| \| \|
\| * \|	#33641: add spec for profile page	Riccardo Padovani	2017-06-15	1	-0/+18
\| \| \|
\| * \|	33641: Add changelog	Riccardo Padovani	2017-06-13	1	-0/+4
\| \| \|
\| * \|	#33461: Display own user id in account settings page	Riccardo Padovani	2017-06-13	1	-4/+11
\| \|/
* \|	Merge branch '33824-update-mr-prometheus-docs' into 'master'	Achilleas Pipinellis	2017-06-19	2	-4/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update Prometheus Merge Request Metrics page See merge request !12259
\| * \|	Update Prometheus Merge Request Metrics page	Joshua Lambert	2017-06-19	2	-4/+4
\|/ /
* \|	Merge branch '26212-upload-user-avatar-trough-api' into 'master'	Rémy Coutable	2017-06-19	4	-0/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Accept image for avatar in user API Closes #26212 See merge request !12143
\| * \|	Accept image for avatar in user API	vanadium23	2017-06-16	4	-0/+17
\| \| \|
* \| \|	Merge branch 'issue_33205' into 'master'	Sean McGivern	2017-06-19	3	-4/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix API bug accepting wrong merge requests parameters Closes #33205 See merge request !12173
\| * \| \|	Fix API bug accepting wrong merge requests parametersissue_33205	Felipe Artur	2017-06-16	3	-4/+28
\| \| \| \|
* \| \| \|	Merge branch 'consistent-filtered-search-boards' into 'master'	Phil Hughes	2017-06-19	1	-1/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make filtered search boards more consistent with EE Closes #33723 See merge request !12235
\| * \| \| \|	Make filtered search boards more consistent with EEconsistent-filtered-search-boards	Clement Ho	2017-06-16	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'consistent-dropdown-hint' into 'master'	Phil Hughes	2017-06-19	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make dropdown hint consistent with EE version Closes #33721 See merge request !12234
\| * \| \| \| \|	Make dropdown hint consistent with EE versionconsistent-dropdown-hint	Clement Ho	2017-06-16	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge branch 'fix-atom-eslint' into 'master'	Tim Zallmann	2017-06-18	1	-16/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix eslint import resolver in Atom v1.18.0 See merge request !12238
\| * \| \| \| \|	refactor zopfli fallback configfix-atom-eslint	Mike Greiling	2017-06-16	1	-15/+6
\| \| \| \| \| \|
\| * \| \| \| \|	don't make assumptions about command line arguments invoking webpack config	Mike Greiling	2017-06-16	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'mr-widget-memory-usage-tech-debt-fix' into 'master'	Phil Hughes	2017-06-17	2	-2/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed utilites imports from ~ to relative paths Closes #33485 See merge request !12026
\| * \| \| \| \| \|	Changed utilites imports from ~ to relative paths	Jose Ivan Vargas	2017-06-16	2	-2/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-revert-11842' into 'master'	Stan Hu	2017-06-16	1	-2/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Partially revert 1e8dbd46 See merge request !12236
\| * \| \| \| \| \| \|	Partially revert 1e8dbd46	Robert Speicher	2017-06-16	1	-2/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/33736#note_32561501
* \| \| \| \| \| \|	Merge branch 'remove_unnecessary_spec_file' into 'master'	Robert Speicher	2017-06-16	1	-102/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary spec file See merge request !12233
\| * \| \| \| \| \| \|	Remove unnecessary spec file	Felipe Artur	2017-06-16	1	-102/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'increase-karma-socket-timeout' into 'master'	Clement Ho	2017-06-16	3	-36/+49
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase karma socket timeout Closes #33735 See merge request !12226
\| * \| \| \| \| \| \|	Increase karma socket timeout	Mike Greiling	2017-06-16	3	-36/+49
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'boards-spec-fix' into 'master'	Robert Speicher	2017-06-16	1	-4/+4
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes boards_spec failure Closes #33614 See merge request !12230
\| * \| \| \| \| \|	Fixes boards_spec failureboards-spec-fix	Phil Hughes	2017-06-16	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #33614
* \| \| \| \| \| \|	Merge branch 'fix-overflow-slash-commands' into 'master'	Annabel Dunstone Gray	2017-06-16	2	-0/+15
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed overflow on mobile screens for the slash commands Closes #29013 See merge request !12100
\| * \| \| \| \| \|	Fixed overflow on mobile screens for the slash commands	Jose Ivan Vargas Lopez	2017-06-16	2	-0/+15
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'backport-panels-styles-from-ee' into 'master'	Annabel Dunstone Gray	2017-06-16	1	-42/+48
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport panels.scss styles from EE See merge request !12206
\| * \| \| \| \|	Backport panels styles from EEbackport-panels-styles-from-ee	Eric Eastwood	2017-06-15	1	-42/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ee/blob/43a570dcf5cbd0a98572d5601e9000e906791db0/app/assets/stylesheets/framework/panels.scss
* \| \| \| \| \|	Merge branch 'merge-request-diffs-table' into 'master'	Douwe Maan	2017-06-16	24	-52/+271
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add table for files in merge request diffs See merge request !12047
\| * \| \| \| \| \|	Add table for files in merge request diffs	Sean McGivern	2017-06-16	24	-52/+271
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds an ID-less table containing one row per file, per merge request diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised currently, with the advantage that we can easily query the attributes of this new table. It does not migrate existing data, so we have fallback code when the legacy st_diffs column is present instead. For a merge request diff to be valid, it should have at most one of: * Rows in this new table, with the correct merge_request_diff_id. * A non-NULL st_diffs column. It may have neither, if the diff is empty.
* \| \| \| \| \|	Merge branch 'tc-fix-group-finder-subgrouping' into 'master'	Douwe Maan	2017-06-16	5	-32/+127
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show private subgroups if member of parent group Closes #32135 See merge request !11764
\| * \| \| \| \| \|	Make the GroupFinder specs more strict	Toon Claes	2017-06-15	2	-21/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure the results match exactly and project authorizations do allow access to sibling groups/projects deeper down. Also apply WHERE scopes before running the UNION, to increase performance.
\| * \| \| \| \| \|	Better exception message and some additional code comment	Toon Claes	2017-06-15	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Subgroups page should show groups authorized through inheritance	Toon Claes	2017-06-15	5	-26/+93
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a user is authorized to a group, they are also authorized to see all the ancestor groups and descendant groups. When a user is authorized to a project, they are authorized to see all the ancestor groups too. Closes #32135 See merge request !11764
* \| \| \| \| \|	Merge branch '33779-reset-session-before-blocking-requests' into 'master'	Robert Speicher	2017-06-16	2	-6/+9
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Call Capybara.reset_sessions! before block_and_wait_for_requests_complete Closes #33779 See merge request !12224
\| * \| \| \| \|	Call Capybara.reset_sessions! before block_and_wait_for_requests_complete33779-reset-session-before-blocking-requests	Rémy Coutable	2017-06-16	2	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	capybara/rspec already calls Capybara.reset_sessions! in an `after` hook, but `block_and_wait_for_requests_complete` is called before it so by calling it explicitely here, we prevent any new requests from being fired. See https://github.com/teamcapybara/capybara/blob/ffb41cfad620de1961bb49b1562a9fa9b28c0903/lib/capybara/rspec.rb#L20-L25 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'	Sean McGivern	2017-06-16	91	-292/+299
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename "Slash commands" to "Quick actions" Closes #27070 See merge request !11811
\| * \| \| \| \| \|	Rename "Slash commands" to "Quick actions"	Eric Eastwood	2017-06-15	91	-292/+299
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070 Deprecate "chat commands" in favor of "slash commands" We looked for things like: - `slash commmand` - `slash_command` - `slash-command` - `SlashCommand`
* \| \| \| \| \|	Merge branch 'issue_20900' into 'master'	Sean McGivern	2017-06-16	21	-347/+182
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove issuable drag and drop and sorting from milestone view Closes #20900 See merge request !11950
\| * \| \| \| \| \|	Improve method names and add more specs	Felipe Artur	2017-06-16	11	-35/+63
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Migration - Remove position field from issues and merge requests	Felipe Artur	2017-06-16	4	-3/+15
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove old specs and add new ones	Felipe Artur	2017-06-16	7	-39/+44
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Order merge requests by priority	Felipe Artur	2017-06-16	8	-156/+10
\| \| \| \| \| \| \|