Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Warn when gitlab-shell version doesn't match requirement.shell-version-warning | Douwe Maan | 2015-04-06 | 3 | -1/+9 |
* | Merge remote-tracking branch 'github.com/master' | Douwe Maan | 2015-04-04 | 8 | -28/+48 |
|\ | |||||
| * | Merge pull request #7982 from Soullivaneuh/help-images | Jeroen van Baarsen | 2015-04-03 | 8 | -28/+48 |
| |\ | |||||
| | * | Fix and improve help rendering | Sullivan SENECHAL | 2015-04-03 | 8 | -28/+48 |
| |/ | |||||
* | | Merge branch 'no-limit-fetch' into 'master' | Douwe Maan | 2015-04-04 | 3 | -6/+0 |
|\ \ | |||||
| * | | Remove sidekiq-limit_fetch because it require Redis 2.6.no-limit-fetch | Douwe Maan | 2015-04-03 | 3 | -6/+0 |
* | | | Merge branch 'update-changelog-for-mr214' into 'master' | Drew Blessing | 2015-04-03 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Updated CHANGELOG for MR 214 | Jeremy Maziarz | 2015-04-03 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'custom-email-reply-to' into 'master' | Douwe Maan | 2015-04-03 | 5 | -1/+12 |
|\ \ | |||||
| * | | Add ability to configure Reply-To address in gitlab.yml | Stan Hu | 2015-04-03 | 5 | -1/+12 |
* | | | Merge branch 'fix-admin-project-urls' into 'master' | Drew Blessing | 2015-04-03 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Fix link paths for http and ssh in admin project show view | Jeremy Maziarz | 2014-10-06 | 1 | -2/+2 |
* | | | | Merge branch 'issue-sidebar-size' into 'master' | Drew Blessing | 2015-04-03 | 2 | -1/+8 |
|\ \ \ \ | |||||
| * | | | | Changes the width of sidebar in issues and MRs when affix event fires | Phil Hughes | 2015-03-26 | 2 | -1/+8 |
* | | | | | Merge branch 'feature_expose_project_labels' into 'master' | Hannes Rosenögger | 2015-04-03 | 4 | -2/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Modified lib/api/entities.rb to expose Project class tag_list property to the... | Cristian Medina | 2015-04-03 | 4 | -2/+22 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'fix-backup-spec-regexp' into 'master' | Douwe Maan | 2015-04-03 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Improve regexp to prevent false positives | Stan Hu | 2015-04-02 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'configurable-attachment-size' into 'master' | Douwe Maan | 2015-04-03 | 18 | -15/+117 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Support configurable attachment size via Application Settings | Stan Hu | 2015-04-02 | 18 | -15/+117 |
* | | | | | Merge branch 'import-current-user' into 'master' | Dmitriy Zaporozhets | 2015-04-02 | 8 | -37/+298 |
|\ \ \ \ \ | |||||
| * | | | | | Add tests.import-current-user | Douwe Maan | 2015-04-01 | 3 | -34/+281 |
| * | | | | | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user i... | Douwe Maan | 2015-03-31 | 5 | -3/+17 |
* | | | | | | Merge branch 'repository-archive-worker' into 'master' | Dmitriy Zaporozhets | 2015-04-02 | 14 | -20/+360 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make sure Sidekiq picks up archive_repo queue in production.repository-archive-worker | Douwe Maan | 2015-04-01 | 1 | -1/+1 |
| * | | | | | | Add tests. | Douwe Maan | 2015-03-31 | 6 | -7/+244 |
| * | | | | | | Add item to changelog. | Douwe Maan | 2015-03-31 | 1 | -0/+1 |
| * | | | | | | Small code cleanup. | Douwe Maan | 2015-03-31 | 2 | -17/+8 |
| * | | | | | | Limit number of concurrent archive_repo jobs to 2. | Douwe Maan | 2015-03-31 | 3 | -0/+6 |
| * | | | | | | Archive repositories in background worker. | Douwe Maan | 2015-03-31 | 6 | -16/+121 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'username-period' into 'master' | Dmitriy Zaporozhets | 2015-04-02 | 16 | -98/+179 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix migration SQL.username-period | Douwe Maan | 2015-03-31 | 1 | -1/+1 |
| * | | | | | | Move files for moved namespaces. | Douwe Maan | 2015-03-31 | 3 | -8/+39 |
| * | | | | | | Fix tests. | Douwe Maan | 2015-03-27 | 4 | -12/+12 |
| * | | | | | | Don't allow username to end in period. | Douwe Maan | 2015-03-27 | 5 | -4/+47 |
| * | | | | | | Use more specific regexes. | Douwe Maan | 2015-03-27 | 7 | -44/+48 |
| * | | | | | | Move User.cleanup_username to Namespace.cleanup_path. | Douwe Maan | 2015-03-27 | 5 | -39/+42 |
* | | | | | | | Merge branch 'backup_skip_option' into 'master' | Dmitriy Zaporozhets | 2015-04-02 | 5 | -15/+119 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | ability to skip some items in backupbackup_skip_option | Valery Sizov | 2015-04-02 | 5 | -15/+119 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'rs-icon-symlink' into 'master' | Douwe Maan | 2015-04-02 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Check symlink mode as a String for file_type_icon_class | Robert Speicher | 2015-04-01 | 2 | -2/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Update CHANGELOG. | Marin Jankovski | 2015-04-02 | 1 | -5/+4 |
* | | | | | | Update changelog for 7.9.2. | Marin Jankovski | 2015-04-02 | 1 | -0/+2 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Marin Jankovski | 2015-03-31 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'no-chmod-r' into 'master' | Dmitriy Zaporozhets | 2015-04-01 | 2 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Don't use chmod_R for backup tars | Vinnie Okada | 2015-03-28 | 2 | -2/+2 |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2015-03-31 | 21 | -101/+263 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'rs-issue-1340' into 'master' | Dmitriy Zaporozhets | 2015-04-01 | 2 | -12/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Unbind task item checkbox events and then rebind them | Robert Speicher | 2015-03-31 | 2 | -12/+4 |
| | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'group-information-leak' into 'master' | Dmitriy Zaporozhets | 2015-04-01 | 5 | -7/+137 |
| |\ \ \ \ \ \ \ |