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

	Commit message (Collapse)	Author	Age	Files	Lines
*	API: Ability to remove source branchapi-remove-source-branch	Robert Schilling	2016-12-04	4	-26/+47
\|
*	Merge branch 'api-expose-commiter-details' into 'master'	Rémy Coutable	2016-12-04	4	-2/+20
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	API: Expose committer details for a commit Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22312 See merge request !7849
\| *	API: Expose committer details for a commitapi-expose-commiter-details	Robert Schilling	2016-12-01	4	-2/+20
\| \|
* \|	Merge branch 'improve-patch-update-guide' into 'master'	Achilleas Pipinellis	2016-12-03	1	-2/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Patch upgrade documentation should be consulted on stable branch Closes #25245. See merge request !7892
\| * \|	Patch upgrade documentation should be consulted on stable branchimprove-patch-update-guide	Rémy Coutable	2016-12-02	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'revert-918d30bf' into 'master'	Achilleas Pipinellis	2016-12-03	1	-6/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'docs/patch-guide-link-to-old-guide' into 'master'" Reverting in favor of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7892 See merge request !7911
\| * \| \|	Revert "Merge branch 'docs/patch-guide-link-to-old-guide' into 'master'"	Achilleas Pipinellis	2016-12-03	1	-6/+0
\|/ / / \| \| \| \| \| \|	This reverts merge request !7909
* \| \|	Merge branch 'docs/patch-guide-link-to-old-guide' into 'master'	Achilleas Pipinellis	2016-12-03	1	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to old patch update guide now that we install workhorse with a raketask Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25284 See merge request !7909
\| * \| \|	Link to old patch update guide now that we install workhorse with a raketask	Achilleas Pipinellis	2016-12-03	1	-0/+6
\|/ / / \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch '23696-fix-diff-view-highlighting' into 'master'	Fatih Acet	2016-12-03	9	-577/+568
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Highlighting lines is broken" ## What does this MR do? Add line highlighting back to diff view. This was working in the MR "changes" tab, but not on a commit page such as https://gitlab.com/winniehell/reproduction-area/commit/9101e66f5761929002956e0f2dd65d7f8643903d ~~This MR also fixes the `scrollToElement` method in `MergeRequestTabs` to account for the extra height of the tab links which are now fixed in place once they are scrolled to the top of the screen.~~ (removed in favor of !7051) This MR also refactors much of the `Diff` and `MergeRequestTabs` classes to es6 syntax in an effort to increase readability. ## Are there points in the code the reviewer needs to double check? Check out both MR "change" tabs and commit diff pages and ensure that line highlighting works and that loading a page with one of these permalink hashes correctly highlights and scrolls to the line. Ensure I didn't break anything in the transition to es6 syntax. Check the functionality of the tabs on MR pages, as well as diff page interactivity (unfolding hidden lines in diff files, adding comments to diffs, etc). I have checked these myself, but another set of eyes would be a good idea. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23696 See merge request !7090
\| * \| \|	satisfy eslint no-param-reassign rule23696-fix-diff-view-highlighting	Mike Greiling	2016-12-02	2	-8/+10
\| \| \| \|
\| * \| \|	display error when a tab cannot be loaded	Mike Greiling	2016-12-02	1	-1/+5
\| \| \| \|
\| * \| \|	use shorthand instead of length > 0 ↵	Mike Greiling	2016-12-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(http://airbnb.io/javascript/#comparison--shortcuts)
\| * \| \|	use e instead of event variable name	Mike Greiling	2016-12-02	2	-10/+10
\| \| \| \|
\| * \| \|	adjust scrollToElement to account for fixed merge request tabs	Mike Greiling	2016-12-02	1	-5/+7
\| \| \| \|
\| * \| \|	re-apply MR !6285 "Added forceLoad ability to singleFileDiffs, added ↵	Luke Bennett	2016-12-02	3	-10/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found" Use url utility to retrieve hash
\| * \| \|	fix eslint failures on Diff and MergeRequestTabs	Mike Greiling	2016-12-02	3	-117/+119
\| \| \| \|
\| * \| \|	remove array destructuring until we can fix babel config	Mike Greiling	2016-12-02	1	-2/+6
\| \| \| \|
\| * \| \|	refactor Diff class event bindings	Mike Greiling	2016-12-02	1	-48/+48
\| \| \| \|
\| * \| \|	refactor Diff to es6 class syntax	Mike Greiling	2016-12-02	3	-42/+35
\| \| \| \|
\| * \| \|	prefer es6 string interpolation over concatination	Mike Greiling	2016-12-02	1	-27/+26
\| \| \| \|
\| * \| \|	refactor awkward bind workarounds into arrow functions	Mike Greiling	2016-12-02	1	-69/+44
\| \| \| \|
\| * \| \|	refactor MergeRequestTabs to es6 class syntax	Mike Greiling	2016-12-02	3	-91/+88
\| \| \| \|
\| * \| \|	update CHANGELOG.md to reflect changes in !7090	Mike Greiling	2016-12-02	1	-0/+4
\| \| \| \|
\| * \| \|	fix diff line highlighting by moving method from the MergeRequestTabs class ↵	Mike Greiling	2016-12-02	2	-42/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to the Diff class.
\| * \| \|	temporarily revert "Added forceLoad ability to singleFileDiffs, added ↵	Mike Greiling	2016-12-02	2	-28/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found" This reverts commit d2ee380816fa161d94da54c1f7e594c9a2ba2241.
* \| \| \|	Merge branch '24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled' ↵	Sean McGivern	2016-12-03	3	-1/+22
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' If SSH prototol is disabled don't say the user requires SSH keys Closes #24921 See merge request !7840
\| * \| \|	Test all values for `enabled_git_access_protocol`	Andrew Smith	2016-12-02	1	-9/+14
\| \| \| \|
\| * \| \|	If SSH prototol is disabled don't say the user requires SSH keys	Andrew Smith	2016-12-01	3	-1/+17
\| \| \| \|
* \| \| \|	Merge branch 'system-font-test' into 'master'	Jacob Schatz	2016-12-02	28	-140/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use system font Just for fun.... ### macOS Chrome (San Francisco): ![Screen_Shot_2016-11-17_at_4.01.29_PM](/uploads/bfbab440ea0136314a6a7cffcd44f3ff/Screen_Shot_2016-11-17_at_4.01.29_PM.png) ### macOS Safari (San Francisco): ![Screen_Shot_2016-11-18_at_8.28.22_AM](/uploads/3adc05d7adf84ca726cbaaf36cb0567d/Screen_Shot_2016-11-18_at_8.28.22_AM.png) #### Ubuntu Firefox (Ubuntu): ![Screen_Shot_2016-11-18_at_8.31.08_AM](/uploads/0f0d581d2d79d5db3dba9b2200499dc7/Screen_Shot_2016-11-18_at_8.31.08_AM.png) #### Windows 7 IE 11 (Segoe UI): ![Screen_Shot_2016-11-18_at_8.35.05_AM](/uploads/88efc2c554252de03fb84cc3c3e2856e/Screen_Shot_2016-11-18_at_8.35.05_AM.png) See merge request !7545
\| * \| \| \|	Remove source sans prosystem-font-test	Annabel Dunstone Gray	2016-12-01	28	-143/+1
\| \| \| \| \|
\| * \| \| \|	Use system font	Annabel Dunstone Gray	2016-12-01	1	-1/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'mr-origin-7855' into 'master'	Rémy Coutable	2016-12-02	4	-17/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a default commit message when adding a README (#25167) Closes #25167 See merge request !7903
\| * \| \| \| \|	Added a changelog entry	mattl	2016-12-02	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	WIP: Adds a default commit message when adding a README (#25167)	mattl	2016-12-02	2	-16/+2
\| \| \| \| \| \|
\| * \| \| \| \|	WIP: Adds a default commit message when adding a README (#25167)25167-default-readme-commit-message	Matt Lee	2016-11-30	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '25264-ref-commit' into 'master'	Jacob Schatz	2016-12-02	4	-13/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change ref property to commitRef ## What does this MR do? Changes `ref` prop to `commitRef` because `ref` is a reserved word in Vue.js ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25264 //cc @selfup See merge request !7901
\| * \| \| \| \| \|	Change prop name to keep consistency with other props.25264-ref-commit	Filipa Lacerda	2016-12-02	2	-9/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Adds changelog entry	Filipa Lacerda	2016-12-02	2	-1/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Change ref property to commitRef	Filipa Lacerda	2016-12-02	3	-13/+13
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'cleanup-common_utils.js' into 'master'	Alfredo Sumaran	2016-12-02	7	-103/+33
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up common_utils.js ## What does this MR do? - Remove unused functions from `common_utils.js`. - Move functions which are used from only one file to that file. ## Why was this MR needed? Because some utils weren't that common (anymore). See merge request !7318
\| * \| \| \| \| \| \|	Clean up common_utils.js (!7318)	winniehell	2016-12-01	7	-103/+33
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2016-12-02	3	-1/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'25251-actionview-template-error-undefined-method-text-for-nil-nilclass' into 'master' Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass Closes #25251 See merge request !7893
\| * \| \| \| \| \| \| \|	Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass25251-actionview-template-error-undefined-method-text-for-nil-nilclass	Valery Sizov	2016-12-02	3	-1/+14
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '23500-enable-colorvariable' into 'master'	Annabel Dunstone Gray	2016-12-02	69	-955/+1982
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable ColorVariable in scss-lint ## What does this MR do? - Enable the ColorVariable rule in`.scss-lint.yml` - Change all color literals in `app/assets/stylesheets` to color variables ## Why was this MR needed? - Enforce the usage of color variables to better constrain the various color values being used ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23500 See merge request !7319
\| * \| \| \| \| \| \|	Enable ColorVariable in scss-lint	Sam Rose	2016-12-01	69	-955/+1982
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '25098-header-margins-on-pipeline-settings' into 'master'	Annabel Dunstone Gray	2016-12-02	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed row margins on Pipeline Settings page in order to unify styles On the ```project-name/pipelines/settings``` page, I removed the ```.row``` styling on ```.build-status``` and ```.coverage-report``` as it was causing those rows to not have the same margins as the "CI/CD Pipeline" row. Now, they are even as you can see below: ![Screen_Shot_2016-12-01_at_12_54_59_PM](/uploads/a7196ff2e8efcdcd072bc2d26634a42d/Screen_Shot_2016-12-01_at_12_54_59_PM.png) ![Screen_Shot_2016-12-01_at_12_53_18_PM](/uploads/615428bab476fcd1baab86837395d800/Screen_Shot_2016-12-01_at_12_53_18_PM.png) Closes #25098 cc: @filipa See merge request !7881
\| * \| \| \| \| \| \| \|	Fixed row margins on Pipeline Settings page in order to unify styles	Ryan Harris	2016-12-01	2	-1/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rs-simplify-changelog-branch_name' into 'master'	Rémy Coutable	2016-12-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify `branch_name` in bin/changelog The `--short` option has existed since at least 1.8.1: https://git-scm.com/docs/git-symbolic-ref/1.8.1 See merge request !7891
\| * \| \| \| \| \| \| \| \|	Simplify `branch_name` in bin/changelogrs-simplify-changelog-branch_name	Robert Speicher	2016-12-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `--short` option has existed since at least 1.8.1: https://git-scm.com/docs/git-symbolic-ref/1.8.1