summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Handle encoding in non-binary Blob instancesupdate-gitlab-gitYorick Peterse2016-09-142-0/+32
| | | | | | | | | | | | | | | | 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.
* Update gitlab_git to 10.6.6Yorick Peterse2016-09-142-4/+4
|
* Merge branch '22053-gitlab-checks-metrics' into 'master' Yorick Peterse2016-09-132-1/+3
|\ | | | | | | | | Gitlab::Checks is now instrumented See merge request !6318
| * Gitlab::Checks is now instrumentedPaco Guzman2016-09-132-1/+3
| | | | | | So we have a detailed view of what checks perform bad
* | Merge branch 'avoid-loading-protected-branches-on-change-access-checks' into ↵Yorick Peterse2016-09-132-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | 'master' Avoid protected branches checks when verifying access without branch name See merge request !6317
| * | Avoid protected branches checks when verifying access without branch namePaco Guzman2016-09-132-0/+2
| |/ | | | | | | | | | | GitlabShell verify access sending ‘_any’ as the changes made on the git command, in those cases Gitlab::Checks::ChangeAccess won’t receive a branch_name so we don’t need to check for access to the protected branches on that repository. So we avoid some git operations in case the are not cached (empty_repo?) and some database lookups to get protected branches. These request is happening in every push.
* | Merge branch '21895-horizontal-scroll-bar-present-in-collapsed-sidebar' into ↵Annabel Dunstone Gray2016-09-131-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-sidebarLuke Bennett2016-09-121-1/+1
| | |
* | | Merge branch '21877-no-mr-branch-title-link-in-issue-on-mobile' into 'master' Annabel Dunstone Gray2016-09-134-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-mobileLuke Bennett2016-09-093-2/+11
| | |
| * | Removed media query declaration relating to merge-request-info and issue-infoLuke Bennett2016-09-071-4/+0
| | |
* | | Merge branch 'fix-commit-status' into 'master' Rémy Coutable2016-09-133-36/+58
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an error where we were unable to create a CommitStatus for running state Due to severe refactoring of Pipeline we introduced regression in how CommitStatus is handled. We received an report that it's impossible to create a CommitStatus with state `running` when there were not previous status. The support for Commit Statuses should be simplified. Right now I'm doing minimal change to move forward and fix a bug, but I'll create a new MR that will move all logic that is now part of `lib/api/commit_statuses.rb` to separate service to simplify the implementation. This error happens due to the fact that we introduced additional status of builds: `created`. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21345 See merge request !6107
| * | | Fix an error where we were unable to create a CommitStatus for running statefix-commit-statusKamil Trzcinski2016-09-123-36/+58
| | | |
* | | | Merge branch ↵Rémy Coutable2016-09-137-173/+81
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19694-remove-duplication-between-project-builds-and-admin-builds-view' into 'master' Remove duplication between project builds and admin builds view Closes #19694 See merge request !5680
| * | | | Remove unnecessary variablesKatarzyna Kobierska2016-09-132-8/+8
| | | | |
| * | | | Code refactoringKatarzyna Kobierska2016-09-133-11/+14
| | | | |
| * | | | Improve build_path name and admin variableKatarzyna Kobierska2016-09-135-14/+13
| | | | |
| * | | | Fix error in pathsKatarzyna Kobierska2016-09-131-6/+5
| | | | |
| * | | | Build path with callKatarzyna Kobierska2016-09-134-30/+6
| | | | |
| * | | | Create shared partial for project and admin buildsKatarzyna Kobierska2016-09-136-93/+46
| | | | |
| * | | | Moved build tabs partial to sharedKatarzyna Kobierska2016-09-133-2/+2
| | | | |
| * | | | Improve table code and add CHANGELOGKatarzyna Kobierska2016-09-132-4/+3
| | | | |
| * | | | Improve code in table partialKatarzyna Kobierska2016-09-131-3/+4
| | | | |
| * | | | Improve codeKatarzyna Kobierska2016-09-135-10/+11
| | | | |
| * | | | Liken admin and project builds views to each otherKatarzyna Kobierska2016-09-133-43/+31
| | | | |
| * | | | Move builds content list to partialKatarzyna Kobierska2016-09-133-40/+45
| | | | |
| * | | | Use local variables in partialKatarzyna Kobierska2016-09-133-10/+10
| | | | |
| * | | | Change the way paths are generatedKatarzyna Kobierska2016-09-135-15/+9
| | | | |
| * | | | Add partial to admin builds and project buildsKatarzyna Kobierska2016-09-135-44/+34
| | | | |
* | | | | Merge branch 's3-region' into 'master' Achilleas Pipinellis2016-09-131-1/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include region in S3 configuration - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5336 See merge request !5896
| * | | | include region for source installation s3-regionChris Wilson2016-09-131-0/+1
| | | | |
| * | | | Include region in S3 configurationChris Wilson2016-08-191-1/+2
| | | | |
* | | | | Merge branch '22057-fix-api-ossues-sorting-flaky-specs' into 'master' Stan Hu2016-09-133-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure specs on sorting of issues in API are deterministic on MySQL ## What does this MR do? Ensure a deterministic order of issues on the existing API issues specs ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To avoid random failures as described on #22057 ## Screenshots (if relevant) ## 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 [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 you do - 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 #22057 See merge request !6306
| * | | | | Ensure specs on sorting of issues in API are deterministic on MySQL22057-fix-api-ossues-sorting-flaky-specsPaco Guzman2016-09-123-0/+8
| | |/ / / | |/| | | | | | | | | | | | | MySQL could not have support for millisecond precision, depends on the MySQL version so we just create issues in different seconds in a deterministic way
* | | | | Merge branch 'rails-5-backports' into 'master' Robert Speicher2016-09-122-7/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | No need for this variable.Connor Shea2016-09-121-6/+1
| | | | | |
| * | | | | Remove x-json mime_type, rename to json_mime_types.rails-5-backportsConnor Shea2016-09-111-3/+2
| | | | | |
| * | | | | Fix two problematic bits of code that will be deprecated or broken in Rails 5.Connor Shea2016-09-052-7/+9
| | | | | |
* | | | | | Merge branch 'update-templates' into 'master' Robert Speicher2016-09-1213-5/+82
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update templates. See merge request !6163
| * | | | | | Update templates.update-templatesRuben Davila2016-09-0113-5/+82
| | | | | | |
* | | | | | | Merge branch '21569-dont-add-created-by-for-matched-users' into 'master' Robert Speicher2016-09-128-6/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add original author tag line when importing from GitHub if there isn't a linked GitLab account ## What does this MR do? If there we've found a linked GitLab user for a creator of an issue or comment don't add the 'Created By:' line. ## What are the relevant issue numbers? Closes #21569 See merge request !6081
| * | | | | | | Only add the original author if there isn't a linked GitLab accountAndrew Smith2016-09-088-6/+42
| | | | | | | |
* | | | | | | | Merge branch 'document-custom-event-tracking' into 'master' Achilleas Pipinellis2016-09-121-0/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how to track custom events ## What does this MR do? This documents how one can track custom events. ## Are there points in the code the reviewer needs to double check? Spelling, etc. ## Why was this MR needed? This wasn't documented. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] 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) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/22070 See merge request !6310
| * | | | | | | | Document how to track custom eventsYorick Peterse2016-09-121-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#22070 [ci skip]
* | | | | | | | | Merge branch '21092-file-execution-flag-is-not-preserved-when-editing-files' ↵Rémy Coutable2016-09-124-9/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_fileRémy Coutable2016-09-121-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-filestiagonbotelho2016-09-094-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactors update file
* | | | | | | | | | Merge branch 'issue_21825' into 'master' Rémy Coutable2016-09-124-0/+46
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 variablesSergey Gnuskov2016-09-094-0/+46
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'slightly-more-readable' into 'master' Rémy Coutable2016-09-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the cases clear instead of having guards See merge request !6304
View Lorry Controller Status