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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Clarify the expiration date of PATsdocs/pat-expiration-date	Achilleas Pipinellis	2017-06-21	1	-0/+3
\| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/22566#note_32336497 [ci skip]
*	Merge branch 'remove-changelog' into 'master'	Clement Ho	2017-06-20	1	-4/+0
\|\ \| \| \| \| \| \| \| \|	Remove changelog entry See merge request !12309
\| *	Remove changelog entry	Annabel Dunstone Gray	2017-06-20	1	-4/+0
\| \|
* \|	Merge branch ↵	Annabel Dunstone Gray	2017-06-20	3	-4/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33363-user-customize-callout-has-no-top-margin-on-projects-page' into 'master' Resolve "User customize callout has no top-margin on projects page" Closes #33592 and #33363 See merge request !12090
\| * \|	Resolve "User customize callout has no top-margin on projects page"	Luke "Jared" Bennett	2017-06-20	3	-4/+2
\|/ /
* \|	Merge branch 'search-clear-button-center' into 'master'	Annabel Dunstone Gray	2017-06-20	1	-3/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed filtered search clear button being off-center Closes #33912 See merge request !12304
\| * \|	Fixed filtered search clear button being off-centersearch-clear-button-center	Phil Hughes	2017-06-20	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #33912
* \| \|	Merge branch '31349-async-buttons' into 'master'	Phil Hughes	2017-06-20	16	-443/+271
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uniformize code between both pipelines tables Closes #31349, #33754, and #31181 See merge request !12232
\| * \| \|	Uniformize code between both pipelines tables	Filipa Lacerda	2017-06-20	16	-443/+271
\|/ / /
* \| \|	Merge branch '33260-allow-admins-to-list-admins' into 'master'	Rémy Coutable	2017-06-20	6	-4/+53
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-instate is_admin flag in users API is current user is an admin Closes #33260 See merge request !12211
\| * \| \|	Re-instate is_admin flag in users API is current user is an admin	Mike Ricketts	2017-06-20	6	-4/+53
\|/ / /
* \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	kushalpandya	2017-06-20	1	-0/+9
\|\ \ \
* \ \ \	Merge branch '33840-revert-sticky-confidential-header' into 'master'confidential-issues-revert	Clement Ho	2017-06-20	4	-37/+43
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert sticky confidential header Closes #33840 See merge request !12307
\| * \| \| \|	Revert sticky confidential header	Annabel Dunstone Gray	2017-06-20	4	-37/+43
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Revert "Merge branch 'confidential-issues-redesign-docs' into 'master'"	Victor Wu	2017-06-20	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !12195
* \| \| \|	Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' ↵	Sean McGivern	2017-06-20	4	-2/+52
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Do not enable prometheus metrics when metrics folder is missing See merge request !12263
\| * \| \| \|	use proper `if defined?` check.33823_do_not_enable_defaults_when_metrics_folder_is_missing	Pawel Chojnacki	2017-06-20	1	-2/+5
\| \| \| \| \|
\| * \| \| \|	Do not enable prometheus metrics when data folder is not present.	Pawel Chojnacki	2017-06-19	4	-2/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ Set defaults correctly only for when not in production or staging + set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru Test prometheus metrics unmemoized
* \| \| \| \|	Merge branch 'api-doc-os-license-alphabetical-order' into 'master'	Rémy Coutable	2017-06-20	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved Open source license templates link into alphabetical order See merge request !12294
\| * \| \| \| \|	Moved Open source license templates link into alphabetical order	Mike Fisher	2017-06-19	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-chat-message-backticks' into 'master'	Sean McGivern	2017-06-20	4	-16/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove backticks from chat messages because they're not rendered as code See merge request !12276
\| * \| \| \| \| \|	Remove backticks from chat messages because they're not rendered as codedm-chat-message-backticks	Douwe Maan	2017-06-19	4	-16/+16
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue-task-status-fix' into 'master'	Filipa Lacerda	2017-06-20	6	-34/+41
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop showing task status if no tasks are present Closes #33880 See merge request !12303
\| * \| \| \| \| \|	Stop showing task status if no tasks are present	Phil Hughes	2017-06-20	6	-34/+41
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the task status would be visible even if there where no tasks in the description. This fixes that by changing the regex to check for tasks without 0. This also fixes a bug where update the description inline would not update the task status text on screen. Closes #33880
* \| \| \| \| \|	Merge branch 'winh-cleanup-vue-warnings' into 'master'	Phil Hughes	2017-06-20	6	-2/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up Vue warnings in tests Closes #33624, #32965, and #33622 See merge request !12163
\| * \| \| \| \| \|	Clean up Vue warnings in tests	Winnie Hellmann	2017-06-20	6	-2/+33
\|/ / / / / /
* \| \| \| \| \|	Merge branch ↵	Phil Hughes	2017-06-20	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33734-transient-karma-failure-on-master-for-date-time-utils-timefor-returns-remaining-time-when-in-the-future' into 'master' Resolve "Transient karma failure on master for `Date time utils timeFor returns remaining time when in the future`" Closes #33734 See merge request !12227
\| * \| \| \| \| \|	Resolve "Transient karma failure on master for `Date time utils timeFor ↵	Mike Greiling	2017-06-20	1	-0/+4
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	returns remaining time when in the future`"
* \| \| \| \| \|	Merge branch '33865-add-emoji-parallel-view' into 'master'	Phil Hughes	2017-06-20	1	-5/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix hover style for emoji button on parallel diff view Closes #33865 See merge request !12281
\| * \| \| \| \| \|	Fix hover style for emoji button on parallel diff view33865-add-emoji-parallel-view	Annabel Dunstone Gray	2017-06-19	1	-5/+0
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master'	Phil Hughes	2017-06-20	2	-2/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix note highlight being added when you don't have a URL fragment hash #note_xxx Closes #33916 See merge request !12293
\| * \| \| \| \| \|	Fix note highlight being added to new notes33916-make-note-highlight-toggle-boolean-explcit	Eric Eastwood	2017-06-19	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always use a explicit true/false value to set highlight because jQuery assumes `null` means toggle from whatever state and doesn't force false. Regressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12098
* \| \| \| \| \| \|	Merge branch '33877-fix-issue-description-highlight-and-math' into 'master'	Phil Hughes	2017-06-20	2	-1/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue description syntax highlighting and math rendering Closes #33877 See merge request !12282
\| * \| \| \| \| \| \|	Fix issue description syntax highlighting and math rendering33877-fix-issue-description-highlight-and-math	Eric Eastwood	2017-06-19	2	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33877 Regressed in https://gitlab.com/gitlab-org/gitlab-ce/commit/5a95d6f8dae00b31b694759c6ddbf6d83b1a7890#3a15290e7696397415523e0b664aceb3dd4010ae_0_46 where the ref no longer matches what we call `renderGFM` on.
* \| \| \| \| \| \| \|	Merge branch 'cs-update-rainbow' into 'master'	Rémy Coutable	2017-06-20	2	-3/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rainbow from 2.1.0 to 2.2.2. See merge request !12289
\| * \| \| \| \| \| \| \|	Update rainbow from 2.1.0 to 2.2.2.cs-update-rainbow	Connor Shea	2017-06-19	2	-4/+5
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changelog: https://github.com/sickill/rainbow/blob/master/Changelog.md#222-2017-04-21 Adds support for Ruby 2.4.
* \| \| \| \| \| \| \|	Merge branch 'cs-update-paranoia' into 'master'	Rémy Coutable	2017-06-20	2	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update paranoia from 2.2 to 2.3.1. See merge request !12288
\| * \| \| \| \| \| \| \|	Update paranoia from 2.2 to 2.3.1.cs-update-paranoia	Connor Shea	2017-06-19	2	-5/+5
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md#230-2017-04-14 Adds support for Rails 5.1.
* \| \| \| \| \| \| \|	Merge branch 'rs-login_as' into 'master'	Rémy Coutable	2017-06-20	6	-66/+72
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove implicit dependency on `gitlab_sign_in` assigning to a user instance variable See merge request !12296
\| * \| \| \| \| \| \| \|	Remove implicit dependency on `gitlab_sign_in` assigning `@user`rs-login_as	Robert Speicher	2017-06-19	6	-66/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We shouldn't be using instance variables in specs to begin with, and depending on this implicit behavior of `gitlab_sign_in` would have made it more difficult to change to `sign_in` where possible. ...we've also gone ahead and changed to `sign_in` where possible.
* \| \| \| \| \| \| \| \|	Merge branch 'cs-update-carrierwave' into 'master'	Robert Speicher	2017-06-20	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update carrierwave from 1.0.0 to 1.1.0. See merge request !12291
\| * \| \| \| \| \| \| \|	Update carrierwave from 1.0.0 to 1.1.0.	Connor Shea	2017-06-19	2	-4/+4
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changelog: https://github.com/carrierwaveuploader/carrierwave/blob/f2f8569b1013f601fe7be4b3a616359acd27240d/CHANGELOG.md#110---2017-04-30 Adds support for Rails 5.1
* \| \| \| \| \| \| \|	Merge branch 'rs-gitlab_sign_in' into 'master'	Douwe Maan	2017-06-20	302	-464/+467
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare for bypassing GitLab sign in in feature specs See merge request !11913
\| * \| \| \| \| \| \|	Fix failure in spec/features/unsubscribe_links_spec.rb	Robert Speicher	2017-06-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not sure why this fails with the full login flow, but it's not necessary and would've been changed eventually anyway, so whatever!
\| * \| \| \| \| \| \|	Include Devise::Test::IntegrationHelpers for all feature specs	Robert Speicher	2017-06-19	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change `logout` uses to `gitlab_sign_out`	Robert Speicher	2017-06-19	10	-27/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change `logout_direct` uses to `gitlab_sign_out_direct`
\| * \| \| \| \| \| \|	Change `login_with` uses to `gitlab_sign_in`	Robert Speicher	2017-06-19	21	-54/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change single `login_via` use to `gitlab_sign_in_via`
\| * \| \| \| \| \| \|	Change `login_as` uses to `gitlab_sign_in`	Robert Speicher	2017-06-19	287	-367/+364
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename methods in the LoginHelpers module	Robert Speicher	2017-06-19	1	-26/+31
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- [x] Rename `login_as` to `gitlab_sign_in` - [x] Rename `login_with` to `gitlab_sign_in_with` - [x] Rename `login_via` to `gitlab_sign_in_via` - [x] Rename `logout` to `gitlab_sign_out` - [x] Rename `logout_direct` to `gitlab_sign_out_direct` - [x] Make `gitlab_login_with` (née `login_with`) private - [x] Make `mock_auth_hash` private
* \| \| \| \| \| \|	Merge branch 'fix-missing-function-dropzone-input' into 'master'	Stan Hu	2017-06-19	2	-0/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restored missing function inside dropzone_input.js Closes #33836 See merge request !12279