Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-06-21Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz
GitLab CI Yaml template dropdown ## What does this MR do? Make it possible to select a dropdown for an easy start with GitLab CI. ## What are the relevant issue numbers? Closes #17521 ## TODO - [ ] Backend - [x] CHANGELOG item - [x] Fix rubocop failure - [x] API Support - [x] New tests - [x] Add disclaimer to the top of the gitlab-ci.yml - [ ] Frontend - [x] New tests See merge request !4411
2016-06-16Merge branch 'template_dropdown' into 'master' Jacob Schatz
Implements TemplateDropdown class to create custom template dropdowns ## What does this MR do? Refactorize template dropdowns. This MR creates a base TemplateSelector class so it can be reused for multiple types of templates. ## 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 - [x] All builds are passing - [ ] 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 !4697
2016-06-12Fix Error 500 when viewing a blob with binary characters after the 1024-byte ↵Stan Hu
mark Here was the problem: 1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file. 2. If the blob is text, GitLab will attempt to display it. 3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters. 4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT. To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires an update to gitlab_git: gitlab-org/gitlab_git!86 Closes #13826
2016-05-20Dropdown implementationAlfredo Sumaran
2016-05-20Dropdown implementationAlfredo Sumaran
2016-05-20Backend for a gitignores dropdownZeger-Jan van de Weg
2016-05-07Update SVG sanitizer to conform to SVG 1.1Stan Hu
Use a custom Loofah scrubber since sanitize 2.x transformers are inadequate to handle case-sensitive SVG attributes. sanitize parses documents as HTML instead of XML, which causes all SVG attribute names (e.g. viewBox) to be downcased. * SVG element list: https://www.w3.org/TR/SVG/eltindex.html * SVG attribute list: https://www.w3.org/TR/SVG/attindex.html Closes #14555
2016-04-28Properly handle bigger filesZeger-Jan van de Weg
2016-04-18Continue implementation of the license template selector and /licenses API ↵Rémy Coutable
endpoint Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-08Diff design updatesAnnabel Dunstone
2016-03-20change the css class has_tooltip to has-tooltip universallyArinde Eniola
2016-03-07Use Rails etag/cache_control helpersJacob Vosmaer
2016-03-07Refactor caching codeJacob Vosmaer
2016-03-03Tell clients/proxies to cache raw blob requestsJacob Vosmaer
2016-02-24Explain why we mangle blob content typesJacob Vosmaer
2016-02-19Add a `Blob` model that wraps `Gitlab::Git::Blob`Robert Speicher
This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG.
2016-02-01Render sanitized SVG imagesStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9265
2016-01-28Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets
Show list of forks for a given Project Closes #2406 See merge request !2376
2016-01-22Fix MR diff 'Edit' buttonDouwe Maan
2016-01-20Fix broken specs. #2406Rubén Dávila
2016-01-20Setup new fork link in sidebar and routes. #2406Rubén Dávila
2016-01-19Refactor Gitlab::Highlight and fix testsDouwe Maan
2016-01-14Remove duplication around highlighting.Douwe Maan
2016-01-14Refactor parallel_diff generation a bit.Douwe Maan
2016-01-12Small fixes from code review. #3945Rubén Dávila
2015-12-30New implementation for highlighting diff files. #3945Rubén Dávila
* It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly.
2015-12-29Add syntax highlighting to diff view. #3945Rubén Dávila
2015-12-18Fix specs and behavior for LFS filesDouwe Maan
2015-12-18Satisfy RubocopDouwe Maan
2015-12-18Automatically fork a project when not allowed to edit a file.Douwe Maan
2015-12-08Only show Edit button for text blobs.Douwe Maan
2015-12-08Show tooltip when trying to edit file when not on branchDouwe Maan
2015-12-07Rename blob helper, bump version of gitlab_git to 7.2.21.Marin Jankovski
2015-12-07Add specs for showing lfs object in UI.Marin Jankovski
2015-12-02Capitalize tab titlesDouwe Maan
2015-07-29Add HTMLGitlab formatterStefan Tatschner
This custom formatter for rouge is needed to generate HTML output specifically for gitlab. Since its usecase is mostly suitable for gitlab it had been rejected upstream: https://github.com/jneen/rouge/pull/268 Thanks a lot to @stanhu, @jneen and @tsigo for review!
2015-07-29Replace Rugments with RougeStefan Tatschner
I have mainly created the rugments fork for the purpose of improving gitlab's highlighting. Nowadays IMO it works way better than the old highlight.js solution. But the development is stuck on my side because of a couple of personal reasons: * I have finished my studies; last months I was writing my master thesis. So there was a huge time problem. I am sorry for that. * I had to move to Munich due to getting a (paid) job. Searching a flat here is horrible... :) * Last but not least, maintaining the same code base in two seperate projects is a mess. I have decided to switch back to rouge due to several reasons: * In the beginning I was quite motivated, but since I start working on my new job next week, the best solution IMO is switching back to upstream rouge. * Rouge is continously improving: https://github.com/jneen/rouge/blob/master/CHANGELOG.md http://rouge.jneen.net/ * There should be absolutely no regressions with this change. Most likely this pull request will almost fix some minor bugs. * One less gem in gitlab is a good thing. since Gitlab is quite a huge bundle of gems. Reducing complexity should be a major milestone. Thanks a lot to @stanhu and @jneen for the review!
2015-05-28Fix git blame syntax highlighting when different commits break up linesStan Hu
Closes #1521
2015-05-20workaround for buggy lexersHannes Rosenögger
if something goes wrong, fall back to the plaintext lexer
2015-05-18Rename MarkdownHelper to MarkupHelperJakub Jirutka
2015-03-28Improve file icons rendering on treeSullivan SENECHAL
2015-02-20Merge branch 'master' into rails-4.1.9Vinnie Okada
Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml
2015-02-18Merge branch 'no-highlight-files' into 'master'Sytse Sijbrandij
Add "NEWS" to no_highlight_files "NEWS" is used in gnu style opensource projects for the changelog. So let's add it to `no_highlight_files`. See merge request !249
2015-02-14Upgrade to Rails 4.1.9Vinnie Okada
Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
2015-01-27Refactor blob helpersDmitriy Zaporozhets
2015-01-15Replace highlight.js with rouge-fork rugmentsStefan Tatschner
I decided to create a fork of rouge as rouge lacks a HTML formatter with the required options such as wrapping a line with <span> tags. Furthermore I was not really convinced about the clarity of rouge's source code. Rugments 1.0.0beta3 for now only includes some basic linting and a new HTML formatter. Everything else should behave the same.
2014-12-03Added "news" to no_highlight_filesStefan Tatschner
2014-11-18revert using the extension of the blob to determine the syntax highlighting ↵Zertrin
language nohighlight functionality for a hardcoded set of filenames is kept
2014-06-07Specify language detection for highlight.jsDmitriy Zaporozhets
Because I am tired of CHANGELOG highlighted as sql file :) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>