summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gitlab 7.9.2Igor Kostenko2015-04-071-1/+1
* Merge branch 'add-menu-icons' into 'master'Dmitriy Zaporozhets2015-04-072-4/+9
|\
| * Add icons to Add dropdown items.add-menu-iconsDouwe Maan2015-04-062-5/+9
* | Merge branch 'emailsonpush-last-line' into 'master'Dmitriy Zaporozhets2015-04-076-12/+7
|\ \
| * | Update gitlab_git to 7.1.6 because 7.1.5 had broken language detection.emailsonpush-last-lineDouwe Maan2015-03-312-3/+3
| * | Update gitlab_git to 7.1.5, to fix final line in EmailsOnPush email diff bein...Douwe Maan2015-03-313-3/+4
| * | Move EmailsOnPush highlight CSS inline instead of being in every notification...Douwe Maan2015-03-313-9/+3
* | | Merge branch 'import-event' into 'master'Dmitriy Zaporozhets2015-04-077-68/+20
|\ \ \
| * | | Change text of project creation event for imports.import-eventDouwe Maan2015-04-062-3/+7
| * | | Use Projects::CreateService to create imported projects so hooks are executed.Douwe Maan2015-04-064-64/+12
| * | | Allow projects to be imported into namespaces user is master of.Douwe Maan2015-04-061-1/+1
| | |/ | |/|
* | | Merge pull request #9091 from bbodenmiller/patch-1Dmitriy Zaporozhets2015-04-061-1/+1
|\ \ \ | |/ / |/| |
| * | remove extra scrollbar on background jobsBen Bodenmiller2015-04-041-1/+1
|/ /
* | Merge remote-tracking branch 'github.com/master'Douwe Maan2015-04-048-28/+48
|\ \
| * \ Merge pull request #7982 from Soullivaneuh/help-imagesJeroen van Baarsen2015-04-038-28/+48
| |\ \
| | * | Fix and improve help renderingSullivan SENECHAL2015-04-038-28/+48
| |/ /
* | | Merge branch 'no-limit-fetch' into 'master'Douwe Maan2015-04-043-6/+0
|\ \ \
| * | | Remove sidekiq-limit_fetch because it require Redis 2.6.no-limit-fetchDouwe Maan2015-04-033-6/+0
* | | | Merge branch 'update-changelog-for-mr214' into 'master'Drew Blessing2015-04-031-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Updated CHANGELOG for MR 214Jeremy Maziarz2015-04-031-0/+1
|/ / /
* | | Merge branch 'custom-email-reply-to' into 'master'Douwe Maan2015-04-035-1/+12
|\ \ \
| * | | Add ability to configure Reply-To address in gitlab.ymlStan Hu2015-04-035-1/+12
* | | | Merge branch 'fix-admin-project-urls' into 'master'Drew Blessing2015-04-031-2/+2
|\ \ \ \
| * | | | Fix link paths for http and ssh in admin project show viewJeremy Maziarz2014-10-061-2/+2
* | | | | Merge branch 'issue-sidebar-size' into 'master'Drew Blessing2015-04-032-1/+8
|\ \ \ \ \
| * | | | | Changes the width of sidebar in issues and MRs when affix event firesPhil Hughes2015-03-262-1/+8
* | | | | | Merge branch 'feature_expose_project_labels' into 'master'Hannes Rosenögger2015-04-034-2/+22
|\ \ \ \ \ \
| * | | | | | Modified lib/api/entities.rb to expose Project class tag_list property to the...Cristian Medina2015-04-034-2/+22
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-backup-spec-regexp' into 'master'Douwe Maan2015-04-031-1/+1
|\ \ \ \ \ \
| * | | | | | Improve regexp to prevent false positivesStan Hu2015-04-021-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-0318-15/+117
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Support configurable attachment size via Application SettingsStan Hu2015-04-0218-15/+117
* | | | | | Merge branch 'import-current-user' into 'master'Dmitriy Zaporozhets2015-04-028-37/+298
|\ \ \ \ \ \
| * | | | | | Add tests.import-current-userDouwe Maan2015-04-013-34/+281
| * | | | | | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user i...Douwe Maan2015-03-315-3/+17
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'repository-archive-worker' into 'master'Dmitriy Zaporozhets2015-04-0214-20/+360
|\ \ \ \ \ \
| * | | | | | Make sure Sidekiq picks up archive_repo queue in production.repository-archive-workerDouwe Maan2015-04-011-1/+1
| * | | | | | Add tests.Douwe Maan2015-03-316-7/+244
| * | | | | | Add item to changelog.Douwe Maan2015-03-311-0/+1
| * | | | | | Small code cleanup.Douwe Maan2015-03-312-17/+8
| * | | | | | Limit number of concurrent archive_repo jobs to 2.Douwe Maan2015-03-313-0/+6
| * | | | | | Archive repositories in background worker.Douwe Maan2015-03-316-16/+121
| |/ / / / /
* | | | | | Merge branch 'username-period' into 'master'Dmitriy Zaporozhets2015-04-0216-98/+179
|\ \ \ \ \ \
| * | | | | | Fix migration SQL.username-periodDouwe Maan2015-03-311-1/+1
| * | | | | | Move files for moved namespaces.Douwe Maan2015-03-313-8/+39
| * | | | | | Fix tests.Douwe Maan2015-03-274-12/+12
| * | | | | | Don't allow username to end in period.Douwe Maan2015-03-275-4/+47
| * | | | | | Use more specific regexes.Douwe Maan2015-03-277-44/+48
| * | | | | | Move User.cleanup_username to Namespace.cleanup_path.Douwe Maan2015-03-275-39/+42
* | | | | | | Merge branch 'backup_skip_option' into 'master'Dmitriy Zaporozhets2015-04-025-15/+119
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |