summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Raise if updating columns in batches within a transactionGrzegorz Bizon2017-06-211-0/+6
* Replace invalid chars while seeding environmentsZeger-Jan van de Weg2017-06-211-1/+1
* Merge branch 'gitaly-auth-token' into 'master'Sean McGivern2017-06-215-30/+52
|\
| * Rubocop and comment fixesJacob Vosmaer2017-06-202-3/+3
| * Send gitaly token to workhorse when neededJacob Vosmaer2017-06-201-3/+8
| * Pass Gitaly token on Ruby gRPC requestsJacob Vosmaer2017-06-194-27/+44
* | Merge branch 'remove-git-commit-attribute' into 'master'Sean McGivern2017-06-211-1/+1
|\ \
| * | Remove unused attr_accessor from Gitlab::Git::CommitJacob Vosmaer2017-06-201-1/+1
| |/
* | Change references from ApplicationSetting to ::ApplicationSetting to make aut...sh-current-settings-autoload-fixStan Hu2017-06-201-5/+5
* | Merge branch 'bugfix/html-email-brackets' into 'master'Douwe Maan2017-06-201-0/+7
|\ \
| * | unwrap all links with no hrefhttp://jneen.net/2017-06-191-0/+7
* | | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-201-12/+14
|\ \ \
| * | | Refactor ProjectsFinder#init_collectionYorick Peterse2017-06-161-12/+14
* | | | Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in...Sean McGivern2017-06-201-1/+15
|\ \ \ \
| * | | | use proper `if defined?` check.33823_do_not_enable_defaults_when_metrics_folder_is_missingPawel Chojnacki2017-06-201-2/+5
| * | | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-191-1/+12
| | |_|/ | |/| |
* | | | Merge branch 'sh-refactor-current-settings' into 'master'Robert Speicher2017-06-192-20/+53
|\ \ \ \ | |_|_|/ |/| | |
| * | | If migrations are pending, make CurrentSettings use existing values and popul...sh-refactor-current-settingsStan Hu2017-06-192-22/+54
| * | | Revert "Merge branch 'rs-revert-11842' into 'master'"Stan Hu2017-06-191-1/+2
| |/ /
* | | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-192-20/+20
|\ \ \
| * | | Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-192-20/+20
* | | | Merge branch 'moved-submodules' into 'master'Rémy Coutable2017-06-192-37/+92
|\ \ \ \
| * | | | repository: index submodules by pathDavid Turner2017-06-162-37/+92
* | | | | Merge branch 'update-column-in-batches-batch-size' into 'master'Rémy Coutable2017-06-191-0/+6
|\ \ \ \ \
| * | | | | Put an upper limit on update batchesupdate-column-in-batches-batch-sizeYorick Peterse2017-06-191-0/+6
| | |_|/ / | |/| | |
* | | | | Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timingsYorick Peterse2017-06-191-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master'Douwe Maan2017-06-192-8/+34
|\ \ \ \ | |/ / / |/| | |
| * | | Add “Project moved” error to Git-over-SSHMichael Kozono2017-06-162-8/+34
* | | | Partially revert 1e8dbd46Robert Speicher2017-06-161-2/+1
|/ / /
* | | Merge branch 'merge-request-diffs-table' into 'master'Douwe Maan2017-06-166-13/+38
|\ \ \
| * | | Add table for files in merge request diffsSean McGivern2017-06-166-13/+38
* | | | Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-161-18/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Better exception message and some additional code commentToon Claes2017-06-151-1/+3
| * | | Subgroups page should show groups authorized through inheritanceToon Claes2017-06-151-18/+23
* | | | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-1620-37/+37
|\ \ \ \ | |_|_|/ |/| | |
| * | | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-1520-37/+37
| |/ /
* | | Add French translations for Cycle Analytics, Project, and Repository pages.Erwan GEORGET2017-06-151-0/+1
* | | Merge branch 'deprecate-gitaly-path' into 'master'Sean McGivern2017-06-151-1/+0
|\ \ \ | |/ / |/| |
| * | Stop using deprecated `path` field on Gitaly messagesAlejandro Rodríguez2017-06-141-1/+0
* | | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-143-2/+111
|\ \ \ | |/ / |/| |
| * | Implement diff viewersDouwe Maan2017-06-143-2/+111
* | | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil Trzciński2017-06-141-6/+6
|\ \ \ | |/ / |/| |
| * | Backport EE changes to the Kubernetes serviceNick Thomas2017-06-141-6/+6
* | | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-143-3/+5
|\ \ \ | |/ / |/| |
| * | Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-missZ.J. van de Weg2017-06-122-3/+3
| * | Fix etag route missesZ.J. van de Weg2017-06-121-2/+2
| * | Raise exception on invalid pipeline cacheKamil Trzcinski2017-06-121-0/+2
* | | Merge branch 'feature/add-support-for-services-configuration' into 'master'Grzegorz Bizon2017-06-145-4/+104
|\ \ \
| * | | Remove Gitlab::Ci::Config::Entry::DockerImageTomasz Maczukin2017-06-123-34/+23
| * | | Send new configuration options with job's payloadTomasz Maczukin2017-06-121-2/+9