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

	Commit message (Collapse)	Author	Age	Files	Lines
*	ES6ify all the things!	Fatih Acet	2016-07-24	270	-10463/+12695
\|
*	Merge branch 'discussion-model' into 'master'	Robert Speicher	2016-07-21	1	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add Discussion model to represent MR/diff discussion Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/10325. See merge request !5376
\| *	Add Discussion model to represent MR/diff discussiondiscussion-model	Douwe Maan	2016-07-20	1	-3/+3
\| \|
* \|	Merge branch 'gl-dropdown-enter-key-fix' into 'master'	Fatih Acet	2016-07-21	1	-1/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed dropdown enter key when searching ## What does this MR do? When searching in a dropdown you can now just press the enter key to trigger a click on the first row rather than having to press the down key & then enter. ## What are the relevant issue numbers? Closes #19741 See merge request !5231
\| * \|	Fixed issue where using arrow keys would require arrow key to be pressed twicegl-dropdown-enter-key-fix	Phil Hughes	2016-07-20	1	-5/+2
\| \| \|
\| * \|	Highlights first row when filtering in dropdowns	Phil Hughes	2016-07-20	1	-0/+11
\| \| \|
\| * \|	Fixed dropdown enter key when searching	Phil Hughes	2016-07-20	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #19741
* \| \|	Merge branch 'sidebar-clipboard-toggle' into 'master'	Fatih Acet	2016-07-20	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent toggling sidebar when clipboard icon clicked. Prevents sidebar being toggle when copy to clipboard icon clicked. Fixes #19399 ![sidebar-toggle](/uploads/e4e8dfe9ff2546464269242b5f3e34b1/sidebar-toggle.gif) See merge request !5326
\| * \| \|	Prevent toggling sidebar when clipboard icon clicked.sidebar-clipboard-toggle	Fatih Acet	2016-07-20	1	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'email-domain-blacklist' into 'master'	Robert Speicher	2016-07-20	1	-0/+11
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added the ability to block sign ups using a domain blacklist. As part of this MR, I restructured the Application Settings form to separate Sign up related settings from Sign in related settings and make everything cleaner and easier to read. Fixes #19749 Related to #5573 See merge request !5259
\| * \| \|	Removed escaping characters by using double quotes.	Patricio Cano	2016-07-18	1	-1/+1
\| \| \| \|
\| * \| \|	Default to manual input for `domain_whitelist`, syntax fixes and added new ↵	Patricio Cano	2016-07-18	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tests.
\| * \| \|	Move inline JS to admin.js.coffee specific file.	Patricio Cano	2016-07-18	1	-0/+12
\| \| \| \|
* \| \| \|	Merge branch 'cs-warn-on-failure' into 'master'	Fatih Acet	2016-07-20	1	-6/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Warn on failure ## What does this MR do? Adds styling and HTML for a `success_with_warnings` status in the MR widget. Unfinished as it needs some plumbing in the relevant CI controllers and models. ## Are there points in the code the reviewer needs to double check? Not at the moment, though I think I'll probably need help getting this to work in the backend. ## What are the relevant issue numbers? #17669 ## Screenshots (if relevant) ![Screen_Shot_2016-06-29_at_12.02.49_PM](/uploads/af4a915689633fe028f44bb34ae7a5b1/Screen_Shot_2016-06-29_at_12.02.49_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc: @ayufan See merge request !5004
\| * \| \| \|	Use switch statements instead of if/else chains.	Connor Shea	2016-07-19	1	-6/+7
\| \| \| \| \|
\| * \| \| \|	Starting work on the warn_on_failure feature for the MR build status.	Connor Shea	2016-07-19	1	-2/+4
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'fix-side-by-side-comment-widget' into 'master'	Jacob Schatz	2016-07-20	1	-7/+8
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix side by side comment widget Fixes comment button for empty lines in side by side diff view. Fixes #19824 Fixes #19957 See merge request !5262
\| * \| \|	Off mouse listener from document for diff comment button.	Fatih Acet	2016-07-19	1	-1/+3
\| \| \| \|
\| * \| \|	Fix inline view for comment button selector.	Fatih Acet	2016-07-19	1	-1/+4
\| \| \| \|
\| * \| \|	Revert "Refactored .prev and .next methods"	Fatih Acet	2016-07-19	1	-7/+3
\| \|/ / \| \| \| \| \| \| \| \| \|	This reverts commit ec37d9553274e3bca58e4de44b932cdc72a37325.
* \| \|	Merge branch 'rename-js-files' into 'master'	Fatih Acet	2016-07-20	4	-0/+0
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace namespace-specific application.js files with namespace-bundle.js files. Following up on the per-page JavaScript improvements, I wanted to replace the use of `application.js` with `namespace-bundle.js` to prevent confusion when downloading more than one application.js file. This is pretty much just for the sake of clarity. cc: @alfredo1 See merge request !5221
\| * \|	Replace namespace-specific application.js files with namespace-bundle.js files.rename-js-files	Connor Shea	2016-07-15	4	-0/+0
\| \| \|
* \| \|	Merge branch 'sidebar-dropdowns-blur-link' into 'master'	Fatih Acet	2016-07-18	1	-0/+2
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Blurs the clicked link in dropdown menus ## What does this MR do? This fixes an issue where the dropdown menu would stay visible even when clicked out of it See merge request !5322
\| * \|	Blurs the clicked link in dropdown menussidebar-dropdowns-blur-link	Phil Hughes	2016-07-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	This fixes an issue where the dropdown menu would stay visible even when clicked out of it
* \| \|	Merge branch 'caironoleto/gitlab-ce-cn-issue-19747'	Douwe Maan	2016-07-18	2	-6/+25
\|\ \ \
\| * \| \|	Allow bulk (un)subscription from issues in issue index	Cairo Noleto	2016-07-14	2	-6/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixies #19747
* \| \| \|	Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-state	Rémy Coutable	2016-07-18	1	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'"" ## What does this MR do? Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564. ## What are the relevant issue numbers? Closes #19872. See merge request !5310
\| * \| \| \|	Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""	Rémy Coutable	2016-07-18	1	-4/+4
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50. See !4892. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Fix activity heatmap to show proper day name.	eanplatter	2016-07-16	1	-1/+1
\|/ / /
* \| \|	Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"revert-bdb6f1e6	Douwe Maan	2016-07-15	4	-30/+14
\| \| \| \| \| \| \| \| \|	This reverts merge request !4970
* \| \|	Merge branch '17341-firefox-u2f' into 'master'	Robert Speicher	2016-07-15	4	-19/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow U2F devices to be used in Firefox - Adds U2F support for Firefox - Improve U2F feature detection logic - Have authentication flow be closer to the spec (single challenge instead of a challenge for each `signRequest`) - Closes #17341 - Related to #15337 See merge request !5177
\| * \| \|	Add a U2F feature spec for multiple devices owned by the same user.17341-firefox-u2f	Timothy Andrew	2016-07-14	2	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. This scenario was previously tested for the registration flow, but not authentication.
\| * \| \|	Use a single challenge for U2F authentication.	Timothy Andrew	2016-07-14	1	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. According to the spec, either we have a single challenge with a number of `signRequests`, or a number of `signRequests`, each with it's own challenge. 2. Previously, we had both these - per-request challenges, as well as a single extra challenge. 3. This commit changes this so that the per-request challenges are removed, leaving only a single challenge, as per the v1.1 U2F API. 4. The existing implementation didn't work in Firefox, because the Firefox (extension) implementation is less flexible with regard to the inputs. 5. Fix teaspoon specs. 6. References: https://fidoalliance.org/specs/fido-u2f-v1.0-nfc-bt-amendment-20150514/fido-u2f-javascript-api.html#h2_background
\| * \| \|	Load Javascript U2F library selectively.	Timothy Andrew	2016-07-14	2	-14/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Only on supported Chrome versions 2. Mainly, this lets us simplify the javascript-based U2F check to `window.u2f`, where `window.u2f` can either be loaded from the GitLab server (for Chrome) or from the Firefox extension. 3. This is a better way to provide browser detection for U2F.
* \| \| \|	Merge branch 'issuable-sidebar-collapsed-tooltip' into 'master'	Fatih Acet	2016-07-15	1	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed collapsed assignee tooltip to users name ## What does this MR do? - Changes the collapsed assignee tooltip the users name rather than the username - Updates the tooltip after updating the assignee ## What are the relevant issue numbers? Closes #19280, #19281 ## Screenshots (if relevant) ![Screen_Shot_2016-06-28_at_17.55.52](/uploads/e6ccc1703f59966c978e731a841aabdc/Screen_Shot_2016-06-28_at_17.55.52.png) See merge request !4976
\| * \| \| \|	Changed collapsed assignee tooltip to users name	Phil Hughes	2016-07-13	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes tooltip when updating the assignee Closes #19280 #19281
* \| \| \| \|	Merge branch 'gl-dropdown-issuable-form' into 'master'	Jacob Schatz	2016-07-15	4	-14/+30
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GL dropdowns in issuable form ## What does this MR do? Changed all the issuable dropdown menus over to user GL dropdowns. This brings the dropdowns to be inline with the issuable filter dropdowns and allows for labels to be created whilst creating/editing an issuable. ## What are the relevant issue numbers? Closes #12574 ## Screenshots (if relevant) See merge request !4970
\| * \| \| \| \|	Updated tests	Phil Hughes	2016-07-07	1	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	GL dropdowns in issuable form	Phil Hughes	2016-07-07	4	-13/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows labels to be created on whilst creating/editing an issuable Closes #12574
* \| \| \| \| \|	Merge branch 'compare-dropdowns' into 'master'	Jacob Schatz	2016-07-15	3	-4/+62
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated compare dropdowns ## What does this MR do? Removes jQuery autocomplete from compare fields and replaces with GitLabs dropdowns. ## What are the relevant issue numbers? Closes #18891 ## Screenshots (if relevant) ![Screen_Shot_2016-06-24_at_14.24.34](/uploads/f34370390183429f604fc48645390f2f/Screen_Shot_2016-06-24_at_14.24.34.png) See merge request !4895
\| * \| \| \| \|	Fixed submit button not enablingcompare-dropdowns	Phil Hughes	2016-07-08	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed tests
\| * \| \| \| \|	Updated dropdowns to use field instead	Phil Hughes	2016-07-08	4	-6/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows a bit more flexibilty and keeps the current functionality
\| * \| \| \| \|	Updated compare dropdowns	Phil Hughes	2016-07-08	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #18891
* \| \| \| \| \|	Merge branch 'lbennett/gitlab-ce-18120-focus-filter-shortcut' into 'master'	Fatih Acet	2016-07-14	3	-12/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added shortcut to focus filters ## What does this MR do? Adds shortcut `f` to focus filter inputs. ## Are there points in the code the reviewer needs to double check? Is this a valid implementation? Please check [this comment below](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4570#note_12359978)! ## Why was this MR needed? Keyboard ninja UX :crossed_swords: ## What are the relevant issue numbers? Closes #18120. ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_18.34.56](/uploads/d4cfb6ec340c118f5227be3f16ffbed1/Screen_Shot_2016-06-09_at_18.34.56.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4763
\| * \| \| \| \| \|	Review changeslbennett/gitlab-ce-18120-focus-filter-shortcut	Luke "Jared" Bennett	2016-07-11	2	-8/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added shortcut to focus all search tags apart from the top nav search	Luke "Jared" Bennett	2016-07-11	3	-9/+12
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated CHANGELOG Added docs for filter shortcut Moved CHANGELOG entry Added phils fixes Fixed search form submitting with empty input Added review fixes Readability and selector perf fix
* \| \| \| \| \|	Revert "Merge branch '18193-developers-can-merge' into 'master' "	Robert Speicher	2016-07-13	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing changes made to fb229bbf7970ba908962b837b270adf56f14098f.
* \| \| \| \| \|	Merge branch 'dropdown-load-fix' into 'master'	Douwe Maan	2016-07-13	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dropdown loading time preformance fix ## What does this MR do? Optimizes the performance of the dropdown load time by just sending the required data to load the dropdown instead of the full object This MR aims to fix #17474 See merge request !5113
\| * \| \| \| \|	adds test to check json fields on simple request and changes the url request ↵	tiagonbotelho	2016-07-12	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	format
\| * \| \| \| \|	fixes missing field on basicprojectdetails	tiagonbotelho	2016-07-12	1	-0/+1
\| \| \| \| \| \|