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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Handle encoding in non-binary Blob instancesupdate-gitlab-git	Yorick Peterse	2016-09-14	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab_git 10.6.4 relies on Rugged marking blobs as binary or not, instead of relying on Linguist. Linguist in turn would mark text blobs as binary whenever they would contain byte sequences that could not be encoded using UTF-8. However, marking such blobs as binary is not correct. If one pushes a Markdown document with invalid character sequences it's still a text based Markdown document and not some random binary blob. This commit overwrites Blob#data so it automatically converts text-based content to UTF-8 (the encoding we use everywhere else) while taking care of replacing any invalid sequences with the UTF-8 replacement character. The data of binary blobs is left as-is.
*	Merge branch '21895-horizontal-scroll-bar-present-in-collapsed-sidebar' into ↵	Annabel Dunstone Gray	2016-09-13	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Removed horizontal overflow from collapsed issuable sidebar ## What does this MR do? Uses flexbox to remove any horizontal overflow from the collapsed issuable sidebar ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? There was a horizontal scrollbar at the bottom of all collapsed issuable sidebars as seen in the screenshot in #21895. ## Screenshots (if relevant) ![2016-09-11_16.28.30](/uploads/8e01565385b1ff0b736630ac3c24a3a1/2016-09-11_16.28.30.gif) ## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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) ## What are the relevant issue numbers? Closes #21895. See merge request !6295
\| *	Removed horizontal overflow from collapsed issuable sidebar21895-horizontal-scroll-bar-present-in-collapsed-sidebar	Luke Bennett	2016-09-12	1	-1/+1
\| \|
* \|	Merge branch '21877-no-mr-branch-title-link-in-issue-on-mobile' into 'master'	Annabel Dunstone Gray	2016-09-13	4	-6/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue merge-request-info missing on mobile ## What does this MR do? Removed media query declaration relating to `.merge-request-info` and `.issue-info`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Mobile UX ## Screenshots (if relevant) ![Screen_Shot_2016-09-07_at_19.10.39](/uploads/6dc39b72459087826071ba9fbd06da17/Screen_Shot_2016-09-07_at_19.10.39.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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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) ## What are the relevant issue numbers? Closes #21877 See merge request !6250
\| * \|	Used flexbox to force related merge request list items into columned items21877-no-mr-branch-title-link-in-issue-on-mobile	Luke Bennett	2016-09-09	3	-2/+11
\| \| \|
\| * \|	Removed media query declaration relating to merge-request-info and issue-info	Luke Bennett	2016-09-07	1	-4/+0
\| \| \|
* \| \|	Remove unnecessary variables	Katarzyna Kobierska	2016-09-13	2	-8/+8
\| \| \|
* \| \|	Code refactoring	Katarzyna Kobierska	2016-09-13	3	-11/+14
\| \| \|
* \| \|	Improve build_path name and admin variable	Katarzyna Kobierska	2016-09-13	5	-14/+13
\| \| \|
* \| \|	Fix error in paths	Katarzyna Kobierska	2016-09-13	1	-6/+5
\| \| \|
* \| \|	Build path with call	Katarzyna Kobierska	2016-09-13	4	-30/+6
\| \| \|
* \| \|	Create shared partial for project and admin builds	Katarzyna Kobierska	2016-09-13	6	-93/+46
\| \| \|
* \| \|	Moved build tabs partial to shared	Katarzyna Kobierska	2016-09-13	3	-2/+2
\| \| \|
* \| \|	Improve table code and add CHANGELOG	Katarzyna Kobierska	2016-09-13	1	-4/+2
\| \| \|
* \| \|	Improve code in table partial	Katarzyna Kobierska	2016-09-13	1	-3/+4
\| \| \|
* \| \|	Improve code	Katarzyna Kobierska	2016-09-13	5	-10/+11
\| \| \|
* \| \|	Liken admin and project builds views to each other	Katarzyna Kobierska	2016-09-13	3	-43/+31
\| \| \|
* \| \|	Move builds content list to partial	Katarzyna Kobierska	2016-09-13	3	-40/+45
\| \| \|
* \| \|	Use local variables in partial	Katarzyna Kobierska	2016-09-13	3	-10/+10
\| \| \|
* \| \|	Change the way paths are generated	Katarzyna Kobierska	2016-09-13	5	-15/+9
\| \| \|
* \| \|	Add partial to admin builds and project builds	Katarzyna Kobierska	2016-09-13	5	-44/+34
\| \| \|
* \| \|	Merge branch 'rails-5-backports' into 'master'	Robert Speicher	2016-09-12	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix two problematic bits of code that will be deprecated or broken in Rails 5. Found in the Rails 5 MR: !5555 These are safe to use in Rails 4.2.7 as well as Rails 5.0.0, so I figured I'd backport them for the sake of making that merge request smaller. The explanation for the mime_types.rb code is here: https://github.com/rails-api/active_model_serializers/issues/1027#issuecomment-126543577 See merge request !6214
\| * \| \|	Fix two problematic bits of code that will be deprecated or broken in Rails 5.	Connor Shea	2016-09-05	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch '21092-file-execution-flag-is-not-preserved-when-editing-files' ↵	Rémy Coutable	2016-09-12	3	-9/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' While using Gitlab UI to edit a file it changes the file permissions this MR aims to fix it Closes #21092 See merge request !5979
\| * \| \| \|	Simplify a condition in Repository#update_file	Rémy Coutable	2016-09-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-files	tiagonbotelho	2016-09-09	3	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactors update file
* \| \| \| \|	Merge branch 'issue_21825' into 'master'	Rémy Coutable	2016-09-12	1	-0/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add information about user and manual build start to runner as variables Closes #21825 See merge request !6201
\| * \| \| \| \|	Add information about user and manual build start to runner as variables	Sergey Gnuskov	2016-09-09	1	-0/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'slightly-more-readable' into 'master'	Rémy Coutable	2016-09-12	1	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the cases clear instead of having guards See merge request !6304
\| * \| \| \| \| \|	Make the cases clear instead of having guardsslightly-more-readable	Lin Jen-Shin	2016-09-12	1	-3/+3
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-defer-resolvable-check' into 'master'	Yorick Peterse	2016-09-12	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only check :can_resolve permission if the note is resolvable See merge request !6298
\| * \| \| \| \|	Only check :can_resolve permission if the note is resolvablesh-defer-resolvable-check	Stan Hu	2016-09-12	1	-1/+2
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently this permission check incurs a significant performance hit on loading issues where it does not make sense to check this permission in the first place.
* \| \| \| \|	Merge branch '21814-fix' into 'master'	Robert Speicher	2016-09-10	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pull import sources from Gitlab::ImportSources ## What does this MR do? `ApplicationSettings.create_from_defaults` defines an array of import sources, but we should be pulling them from `Gitlab::ImportSources.options` since that's what they're validated against. ## What are the relevant issue numbers? Closes #21814 See merge request !6293
\| * \| \| \|	Pull import sources from Gitlab::ImportSources	Ojas Shirekar	2016-09-09	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'enable-pipeline-events-by-default' into 'master'	Robert Speicher	2016-09-09	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable pipeline events by default This should probably be included in !5620 but missed. See merge request !6278
\| * \| \| \| \|	Enable pipeline events by defaultenable-pipeline-events-by-default	Lin Jen-Shin	2016-09-09	1	-0/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not sure why I missed this before. I thought I added it.
* \| \| \| \|	Merge branch 'add-remember-option-u2f' into 'master'	Robert Speicher	2016-09-09	3	-2/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass the remember_me option into the u2f form and support it while authenticating ## What does this MR do? Adds remember me support in the u2f authentication, and makes sure the flag gets passed from the login form to the u2f form. Based on the changes for the same thing done for regular 2fa: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4369 ## Why was this MR needed? The remember me option wasn't working for u2f devices (yubikey) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18103 See merge request !5918
\| * \| \| \| \|	Pass the remember_me option into the u2f form and support it while ↵add-remember-option-u2f	DJ Mountney	2016-09-01	3	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	authenticating Matches the changes done for non-u2f two-factor auth
* \| \| \| \| \|	Merge branch 'branches-mr-button-permissions' into 'master'	Robert Speicher	2016-09-09	1	-2/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hides merge request button on branches page ## What does this MR do? If user does not have the correct permissions, the merge request button is hidden ## What are the relevant issue numbers? Closes #21805 See merge request !6181
\| * \| \| \| \| \|	Hides merge request button on branches pagebranches-mr-button-permissions	Phil Hughes	2016-09-02	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If user does not have the correct permissions, the merge request button is hidden Closes #21805
* \| \| \| \| \| \|	Merge branch '20300-restore-comments' into 'master'	Jacob Schatz	2016-09-09	75	-62/+757
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore comments lost when converting CoffeeScript to JavaScript ## What does this MR do? Restores comments lost in the great fire of !5464. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? #20300 ## What are the relevant issue numbers? - #20300 (comments) - #20098 (ES6) ## 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) Closes #20300 See merge request !5541
\| * \| \| \| \| \|	Require comments must be included before code	Jared Deckard	2016-09-08	1	-3/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Restore comments lost when converting CoffeeScript to JavaScript	Jared Deckard	2016-09-08	75	-62/+760
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'gitlab-workhorse-safeties' into 'master'	Jacob Vosmaer (GitLab)	2016-09-09	4	-8/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Security and safety improvements for gitlab-workhorse integration Companion to https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/60 - Use a custom content type when sending data to gitlab-workhorse - Verify (using JWT and a shared secret on disk) that internal API requests came from gitlab-workhorse This will allow us to build features in gitlab-workhorse that require more trust, and protect us against programming mistakes in the future. This is designed so that no action is required for installations from source. For omnibus-gitlab we need to add code that manages the shared secret. See merge request !5907
\| * \| \| \| \| \|	Verify JWT messages from gitlab-workhorse	Jacob Vosmaer	2016-09-05	4	-8/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '21714-refresh-the-todos-count-cache-after-issuable-delete' ↵	Rémy Coutable	2016-09-09	2	-0/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Refresh todos count cache when an Issue/MR is deleted Fixes #21714 See merge request !6161
\| * \| \| \| \| \| \|	Refresh todos count cache when an Issue/MR is deleted	Douglas Barbosa Alexandre	2016-09-08	2	-0/+22
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sidekiq-ps-parsing' into 'master'	Rémy Coutable	2016-09-09	2	-6/+21
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Moves splitting of `ps` result to helper. * Users a regexp to extract the different parts The result of `ps` at least depends on the _LANG_ and the distance of _start_ to _now_ (start time then the day + hour then month+day) I've tested with _LANG=en_US.UTF-8_ and _LANG=de_CH.UTF-8_ Closes #20632 See merge request !6245
\| * \| \| \| \| \| \|	Remove original regexp	Pascal Betz	2016-09-08	1	-9/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Reformat Regexp	Pascal Betz	2016-09-08	2	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix show template (missing tr) Separate exercise/verify