summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Override exclusive_lease_key method in RecordsUpload47513-upload-migration-lease-key-is-incorrect-for-non-mounted-uploadersJan Provaznik2018-06-121-6/+10
* Use upload ID instead of model ID in lease keyJan Provaznik2018-06-124-8/+28
* Merge branch 'sh-github-importer-improve-error' into 'master'James Lopez2018-06-111-1/+4
|\
| * GitHub Rake importer: Fail with a clearer explanation if GitLab username is w...Stan Hu2018-06-111-1/+4
* | Merge branch '46708-page-numbers' into 'master'Clement Ho2018-06-112-0/+24
|\ \
| * | Override BS4 pagination variablesAnnabel Dunstone Gray2018-06-082-0/+24
* | | Merge branch 'unify-uploaders-objects_storage.rb' into 'master'Robert Speicher2018-06-111-2/+2
|\ \ \
| * | | Unify from EE for app/uploaders/object_storage.rbLin Jen-Shin2018-06-121-2/+2
* | | | Merge branch 'unify-http_status.js' into 'master'Clement Ho2018-06-111-0/+1
|\ \ \ \
| * | | | Add NOT_FOUND: 404 from EELin Jen-Shin2018-06-121-0/+1
| |/ / /
* | | | Merge branch 'sh-expire-content-cache-after-import' into 'master'Mayra Cabrera2018-06-118-14/+32
|\ \ \ \ | |/ / / |/| | |
| * | | Fix Rubocop failure in spec/models/project_spec.rbStan Hu2018-06-111-1/+1
| * | | Work around limitations of expect_any_instance_of by stubbing Project.findStan Hu2018-06-113-9/+23
| * | | Expire Wiki content cache after importing a repositoryStan Hu2018-06-116-5/+9
| | |/ | |/|
* | | Merge branch 'sh-admin-gitaly-server-fix' into 'master'Clement Ho2018-06-112-2/+5
|\ \ \
| * | | Fix translation placeholder for Gitaly addressStan Hu2018-06-102-1/+4
| * | | Revert extra CSS causing Gitaly Servers table to be misalginedStan Hu2018-06-101-1/+1
| |/ /
* | | Merge branch 'jprovazn-rails5-boards' into 'master'Rémy Coutable2018-06-111-6/+12
|\ \ \
| * | | Fix conversion of integer into string in board specJan Provaznik2018-06-091-6/+12
| |/ /
* | | Merge branch '47684-uploads-specs-are-failing-on-master' into 'master'Sean McGivern2018-06-114-4/+4
|\ \ \
| * | | Don't use Rails.root.join for upload fixture pathsRémy Coutable2018-06-114-4/+4
* | | | Merge branch 'ide-etag-polling' into 'master'Filipa Lacerda2018-06-114-28/+51
|\ \ \ \
| * | | | fixed specsPhil Hughes2018-06-111-18/+29
| * | | | Fix IDE pipelines eTagPoll not stoppingPhil Hughes2018-06-113-10/+22
* | | | | Merge branch 'docs-11-0-installation-from-source-guide' into 'master'Mayra Cabrera2018-06-112-2/+364
|\ \ \ \ \
| * | | | | Fix formattingStan Hu2018-06-081-10/+10
| * | | | | Update Ruby upgrade instructions for 11.0Stan Hu2018-06-081-4/+4
| * | | | | Update installation.mddocs-11-0-installation-from-source-guideFilipa Lacerda2018-06-051-1/+1
| * | | | | Create update guideFilipa Lacerda2018-06-011-0/+362
| * | | | | Update installation from source guideFilipa Lacerda2018-06-011-2/+2
* | | | | | Merge branch 'leipert-add-memory-info' into 'master'Tim Zallmann2018-06-112-1/+7
|\ \ \ \ \ \
| * | | | | | set max_old_space_size to 3.5 GB for compile-assets jobLukas Eipert2018-06-112-1/+7
* | | | | | | Merge branch 'sh-suppress-env-leaks' into 'master'Kamil Trzciński2018-06-111-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Prevent ENV from leaking variables in CI outputStan Hu2018-06-081-0/+2
* | | | | | | | Merge branch 'use-tooltip-component-in-mr-widget-author-time-component' into ...Filipa Lacerda2018-06-116-12/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Update MrWidgetAuthorTime and MRWidgetMerged specGeorge Tsiolis2018-06-112-2/+2
| * | | | | | | | Rename MrWidgetAuthorTime vue componentGeorge Tsiolis2018-06-115-8/+13
| * | | | | | | | Use Tooltip component in MrWidgetAuthorTime vue componentGeorge Tsiolis2018-06-111-2/+5
* | | | | | | | | Merge branch 'fj-relax-url-validator-rules-for-user' into 'master'Douwe Maan2018-06-119-27/+116
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoid checking the user format in every url validationFrancisco Javier López2018-06-119-27/+116
|/ / / / / / / / /
* | | | | | | | | Merge branch 'unify-views-search-results' into 'master'Douwe Maan2018-06-113-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Hide project name if searching against a projectLin Jen-Shin2018-06-112-1/+6
| * | | | | | | | | Unify app/views/search/results by using EELin Jen-Shin2018-06-112-2/+3
* | | | | | | | | | Merge branch 'gitaly-1215-ca-count-commits' into 'master'Sean McGivern2018-06-111-15/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Migrate CycleAnalytics::CommitCount to GitalyKim Carlbäcker2018-06-111-15/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'jprovazn-rails5-opclasses' into 'master'Yorick Peterse2018-06-111-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing `:comment` attributeJan Provaznik2018-06-101-1/+6
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch '47679-fix-failed-jobs-tab-ie11' into 'master'Phil Hughes2018-06-112-0/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Resolve "Table on Failed Jobs tab is overflowing in IE11 and sm screens"André Luís2018-06-112-0/+10
|/ / / / / / / /
* | | | | | | | Merge branch 'gitlab-git-nlbr' into 'master'Sean McGivern2018-06-1122-47/+82
|\ \ \ \ \ \ \ \