Find a file
Sean McGivern 70af1e2e03 Fix 500 error when trying to resolve non-ASCII conflicts in editor
When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't
always call `lines`, which meant that we didn't get the benefit of the
side-effect from that, where it forced the conflict data itself to UTF-8.

To fix that, make this explicit by separating the `raw_content` (any encoding)
from the `content` (which is either UTF-8, or an exception is raised).
2018-03-23 18:33:14 +00:00
.github
.gitlab Bug.md: Use html comments instead of asking to remove the notice 2018-02-24 08:57:36 +00:00
app Merge branch '43525-limit-number-of-failed-logins-using-ldap' into 'master' 2018-03-23 13:54:59 +00:00
bin Generate EE changelog under ee/changelogs/unreleased/ 2018-02-20 16:12:48 +01:00
builds
changelogs Fix 500 error when trying to resolve non-ASCII conflicts in editor 2018-03-23 18:33:14 +00:00
config Merge branch 'mark-legacy-git-access' into 'master' 2018-03-23 10:20:45 +00:00
db Merge branch 'mark-legacy-git-access' into 'master' 2018-03-23 10:20:45 +00:00
doc Merge branch 'patch-28' into 'master' 2018-03-23 14:52:40 +00:00
docker Common Docker Documentation Location in gitlab-ce 2017-08-25 19:23:49 +00:00
features Merge branch 'projects-graphs-rspec' into 'master' 2018-03-14 11:16:25 +00:00
fixtures/emojis Move :gay_pride_flag: to flags category 2017-11-15 07:36:19 -06:00
generator_templates Run plugins as separate process and pass data via STDIN 2018-02-26 16:06:49 +02:00
lib Fix 500 error when trying to resolve non-ASCII conflicts in editor 2018-03-23 18:33:14 +00:00
locale Fix inconsistent punctuation on MR form 2018-03-12 20:07:40 +01:00
log
plugins/examples Reorganize plugins dir structure 2018-02-26 16:06:49 +02:00
public Add the /help page in robots.txt 2018-03-22 10:55:02 +01:00
qa Fix end-to-end specs for rebasing a merge request 2018-03-20 11:59:00 +01:00
rubocop Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6' 2018-03-21 14:39:21 +00:00
scripts Prettier Phase 1: Prettier Configuration, Prettifying of files and documentation 2018-03-14 19:32:36 +00:00
shared Add GitLab Pages 2017-01-31 22:50:39 +00:00
spec Fix 500 error when trying to resolve non-ASCII conflicts in editor 2018-03-23 18:33:14 +00:00
symbol Resolve "Better SVG Usage in the Frontend" 2017-09-22 08:39:47 +00:00
tmp Move Prometheus presentation logic to PrometheusText 2017-06-02 19:45:58 +02:00
vendor Show Ajax requests in performance bar 2018-03-19 19:06:09 +00:00
.babelrc Exclude translations from coverage report 2018-01-10 14:57:24 +01:00
.codeclimate.yml Merge branch 'dz-system-hooks-plugins' into 'master' 2018-03-01 10:51:36 +00:00
.csscomb.json Remove SCSS rules for short hex chars. 2016-10-03 20:40:22 -04:00
.eslintignore Fix linting errors in locale/index.js 2017-09-27 13:55:41 +02:00
.eslintrc Prettier Phase 1: Prettier Configuration, Prettifying of files and documentation 2018-03-14 19:32:36 +00:00
.flayignore Ignore Flay failures 2018-01-31 14:41:27 +01:00
.foreman
.gitignore Prettier Phase 1: Prettier Configuration, Prettifying of files and documentation 2018-03-14 19:32:36 +00:00
.gitlab-ci.yml Rename manual job to package-and-qa 2018-03-16 16:48:27 +00:00
.haml-lint.yml Add custom linter for inline JavaScript to haml_lint (!9742) 2017-08-07 11:37:16 +02:00
.mailmap
.nvmrc Update .nvmrc to current stable (v9.0.0) 2017-11-02 13:15:39 +01:00
.pkgr.yml
.prettierignore remove svg.config.js as it no longer exists 2018-03-22 13:52:55 -05:00
.prettierrc Update Prettier Print WIdth to 100 2018-03-23 12:26:57 +01:00
.rubocop.yml Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6' 2018-03-21 14:39:21 +00:00
.rubocop_todo.yml Moved o_auth/saml/ldap modules under gitlab/auth 2018-02-28 16:53:02 +01:00
.ruby-version Update Ruby version to 2.3.6 2017-12-21 15:51:54 +01:00
.scss-lint.yml Enable UnnecessaryMantissa in scss-lint 2017-11-09 21:06:03 +09:00
CHANGELOG.md Update CHANGELOG.md for 10.6.0 2018-03-22 08:49:31 +01:00
config.ru Increase the memory limits used in the unicorn killer 2018-03-22 17:21:10 -07:00
CONTRIBUTING.md Merge branch 'patch-28-docs' into 'master' 2018-03-09 11:33:29 +00:00
doc_styleguide.md
docker-compose.yml
Gemfile Merge branch 'master' into 'latest-security-to-master-21-03-18' 2018-03-22 11:04:03 +00:00
Gemfile.lock Merge branch 'master' into 'latest-security-to-master-21-03-18' 2018-03-22 11:04:03 +00:00
Gemfile.rails5 [Rails5] Add Gemfile.rails5 2018-03-15 09:50:16 +11:00
Gemfile.rails5.lock [Rails5] Add Gemfile.rails5 2018-03-15 09:50:16 +11:00
GITALY_SERVER_VERSION Use Gitaly 0.91.0 2018-03-16 15:53:49 +01:00
GITLAB_PAGES_VERSION Upgrade GitLab Pages to v0.7.1 2018-03-13 19:47:41 +00:00
GITLAB_SHELL_VERSION Send Gitaly payload for git-upload-archive SSH commands 2018-03-21 10:57:06 -03:00
GITLAB_WORKHORSE_VERSION Upgrade Workhorse to 4.0.0 2018-03-07 16:48:58 +01:00
LICENSE Update LICENSE to carve out third party licenses. 2017-09-19 17:38:48 +00:00
MAINTENANCE.md Change location of the maintenance policy document. Add version support information. [CI skip] 2017-10-11 15:01:55 +02:00
package.json Updates svg dependency 2018-03-19 09:16:35 +00:00
PROCESS.md Clarify that the Pick Into X.Y label is added after approval 2018-03-08 10:29:53 +00:00
Procfile Launch mail_room manually and remove foreman reference 2018-03-21 11:52:05 -05:00
Rakefile
README.md Add badge for dependency status 2017-08-16 12:35:42 +02:00
VERSION Update VERSION to 10.7.0-pre 2018-03-22 08:59:44 +01:00
yarn.lock Updates svg dependency 2018-03-19 09:16:35 +00:00

GitLab

Build status Overall test coverage Dependency Status Code Climate Core Infrastructure Initiative Best Practices Gitter

Test coverage

  • Ruby coverage Ruby
  • JavaScript coverage JavaScript

Canonical source

The canonical source of GitLab Community Edition is hosted on GitLab.com.

Open source software to collaborate on code

To see how GitLab looks please see the features page on our website.

  • Manage Git repositories with fine grained access controls that keep your code secure
  • Perform code reviews and enhance collaboration with merge requests
  • Complete continuous integration (CI) and CD pipelines to builds, test, and deploy your applications
  • Each project can also have an issue tracker, issue board, and a wiki
  • Used by more than 100,000 organizations, GitLab is the most popular solution to manage Git repositories on-premises
  • Completely free and open source (MIT Expat license)

Hiring

We're hiring developers, support people, and production engineers all the time, please see our jobs page.

Editions

There are two editions of GitLab:

  • GitLab Community Edition (CE) is available freely under the MIT Expat license.
  • GitLab Enterprise Edition (EE) includes extra features that are more useful for organizations with more than 100 users. To use EE and get official support please become a subscriber.

Website

On about.gitlab.com you can find more information about:

Requirements

Please see the requirements documentation for system requirements and more information about the supported operating systems.

Installation

The recommended way to install GitLab is with the Omnibus packages on our package server. Compared to an installation from source, this is faster and less error prone. Just select your operating system, download the respective package (Debian or RPM) and install it using the system's package manager.

There are various other options to install GitLab, please refer to the installation page on the GitLab website for more information.

You can access a new installation with the login root and password 5iveL!fe, after login you are required to set a unique password.

Contributing

GitLab is an open source project and we are very happy to accept community contributions. Please refer to CONTRIBUTING.md for details.

Install a development environment

To work on GitLab itself, we recommend setting up your development environment with the GitLab Development Kit. If you do not use the GitLab Development Kit you need to install and setup all the dependencies yourself, this is a lot of work and error prone. One small thing you also have to do when installing it yourself is to copy the example development unicorn configuration file:

cp config/unicorn.rb.example.development config/unicorn.rb

Instructions on how to start GitLab and how to run the tests can be found in the getting started section of the GitLab Development Kit.

Software stack

GitLab is a Ruby on Rails application that runs on the following software:

  • Ubuntu/Debian/CentOS/RHEL/OpenSUSE
  • Ruby (MRI) 2.3
  • Git 2.8.4+
  • Redis 2.8+
  • PostgreSQL (preferred) or MySQL

For more information please see the architecture documentation.

UX design

Please adhere to the UX Guide when creating designs and implementing code.

Third-party applications

There are a lot of third-party applications integrating with GitLab. These include GUI Git clients, mobile applications and API wrappers for various languages.

GitLab release cycle

For more information about the release process see the release documentation.

Upgrading

For upgrading information please see our update page.

Documentation

All documentation can be found on docs.gitlab.com/ce/.

Getting help

Please see Getting help for GitLab on our website for the many options to get help.

Is it any good?

Yes

Is it awesome?

Thanks for asking this question Joshua. These people seem to like it.