summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Obtain lease before querying LDAPldap-lease-8.5Jacob Vosmaer2016-03-111-1/+1
* Backport ExclusiveLease to 8.5Jacob Vosmaer2016-03-111-0/+41
* Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master'Rémy Coutable2016-03-021-1/+1
* Merge branch 'saml-decoupling' into 'master'Patricio Cano2016-02-193-4/+60
* Merge branch 'rs-issue-13469' into 'master' Douwe Maan2016-02-171-0/+2
|\
| * Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469Robert Speicher2016-02-151-0/+2
* | Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan2016-02-162-17/+10
|\ \
| * | Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-112-17/+10
* | | Fix undefined method `postgresql?` during migrationrs-gitlab-database-moduleRobert Speicher2016-02-151-6/+2
| |/ |/|
* | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docsBen Boeckel2016-02-122-3/+25
* | Load all blob data when highlighting content for git-blame.Rubén Dávila2016-02-111-0/+1
|/
* Merge branch 'freeze-constants-lib-gitlab-git' into 'master' Robert Speicher2016-02-091-3/+3
|\
| * Freeze the expression instead of the literalZeger-Jan van de Weg2016-02-051-2/+1
| * Minor refactoring on Gitlab::GitZeger-Jan van de Weg2016-02-051-3/+4
* | Merge branch 'increase_import_timeout' into 'master' Douwe Maan2016-02-091-1/+1
|\ \
| * | Increase project import timeout from 4 minutes to 15 minutesDrew Blessing2016-02-041-1/+1
| |/
* | Merge branch 'snippet_search_refactoring'Valery Sizov2016-02-091-7/+3
|\ \
| * | one more improvement to snippet searchValery Sizov2016-02-051-1/+1
| * | Faster snippet searchValery Sizov2016-02-051-6/+2
| |/
* | Fix CurrentSettings autoload bug in development.huacnlee/current-settings-autoload-bug-in-developmentJason Lee2016-02-081-2/+2
|/
* Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan2016-02-042-3/+3
|\
| * fixed move project method in migrationJames Lopez2016-02-021-1/+1
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-02-021-4/+4
| |\
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-02-014-70/+52
| |\ \
| * | | refactor previous test and add validation to project modelJames Lopez2016-01-291-2/+2
* | | | Merge remote-tracking branch 'origin/rs-database-info'Dmitriy Zaporozhets2016-02-041-6/+32
|\ \ \ \
| * | | | Display database type and version in Administration dashboardrs-database-infoRobert Speicher2016-02-021-6/+32
* | | | | Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-032-1/+41
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Memoize Akismet client initialization on AkismetHelperDouglas Barbosa Alexandre2016-02-021-2/+2
| * | | | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-022-1/+41
| | |_|/ | |/| |
* | | | Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-021-0/+21
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into git-raw-workhorseJacob Vosmaer2016-02-021-4/+4
| |\ \ \ \ | | |/ / /
| * | | | Gotta have newlinesJacob Vosmaer2016-02-011-1/+1
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-raw...Jacob Vosmaer2016-02-0122-267/+657
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Use only one header to send git blobsJacob Vosmaer2016-02-011-0/+21
* | | | | Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobsJacob Vosmaer2016-02-021-4/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Allow "@" in file names and pathallow-@Jacob Vosmaer2016-02-011-4/+4
| | |/ / | |/| |
* | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobsJacob Vosmaer2016-02-0118-244/+628
|\ \ \ \ | |/ / /
| * | | Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-293-36/+52
| * | | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-281-34/+0
| | |/ | |/|
| * | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-281-0/+54
| |\ \
| | * | Move blame group logic to dedicated classDouwe Maan2016-01-281-0/+54
| * | | Merge branch 'fix-preventing-migration-from-crashing-in-specific-cases' into ...Dmitriy Zaporozhets2016-01-281-12/+19
| |\ \ \ | | |/ / | |/| |
| | * | Use ActiveRecord::Base.connection.active? and rescue any exception in connect...fix-preventing-migration-from-crashing-in-specific-casesRémy Coutable2016-01-281-1/+4
| | * | Only create the defaults ApplicationSetting when DB is fully migratedRémy Coutable2016-01-281-19/+16
| | * | Ensure rake tasks that don't need a DB connection can be run without oneRémy Coutable2016-01-261-1/+1
| | * | Fix preventing migration from crashing in very specific casesRémy Coutable2016-01-251-0/+7
| * | | Wrap errors on GitHub importer to raise Projects::ImportService::ErrorDouglas Barbosa Alexandre2016-01-262-7/+12
| * | | Move Gitlab::BitbucketImport::KeyDeleter to it's own importerDouglas Barbosa Alexandre2016-01-261-18/+29
| * | | Correct arity for instrumented methods w/o argsinstrumentation-signatureYorick Peterse2016-01-251-3/+19
| |/ /
View Lorry Controller Status