summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move project file links to tab bar.project-file-tabsDouwe Maan2015-04-062-15/+16
|
* 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 rendering
| | * 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. See merge request !491
| * | 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 !214 Forgot to update the CHANGELOG for !214. Prompted by @dblessing to submit this MR to fix that. See merge request !493
| * | 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 ### What does this MR do? This MR adds configuration variable `email_reply_to` to make it possible to configure a custom Reply-To address other than the default `noreply@mydomain.com`. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1305 See merge request !455
| * | Add ability to configure Reply-To address in gitlab.ymlStan Hu2015-04-035-1/+12
| | | | | | | | | | | | Closes #1305
* | | Merge branch 'fix-admin-project-urls' into 'master'Drew Blessing2015-04-031-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link paths for http and ssh in the admin project show view are incorrect The link paths for http and ssh in the admin project show view are incorrect. Clicking on them effectively reloads the page. I think the intent is to have the links point to the project dashboard. Incorrect: http://gitlab.example.com/admin/projects/[namespace]/[project] Correct: http://gitlab.example.com/[namespace]/[project] See merge request !214
| * | | 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 fires Fixes #1320 Width is set when Bootstraps affix event is fired and then removed when it reaches the top or bottom. See merge request !464
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposing Project Labels in the REST API The intent here is to expose the tag_list property of the Project entity over the REST API so that any project searches include the information. The specific reason I've implemented this change is for an environment in which multiple gitlab servers exist, where a central portal to the projects that are spread around the network will be useful. Having access to filtering on this fairly large project list based on their labels, will be of great use. This satisfies the feature request http://feedback.gitlab.com/forums/176466-general/suggestions/6325819-project-labels-via-api The change was made in the `lib/api/entities.rb` file. The output of a `GET` to something like `/projects` or `/projects/7` is now: ```javascript { "id": 7, "description": "Veritatis est eaque voluptas magni expedita.", "default_branch": "master", **"tag_list": [ "typeahead", "twitter" ],** "public": false, "archived": false, "visibility_level": 0, ... } ``` See merge request !329
| * | | | | Modified lib/api/entities.rb to expose Project class tag_list property to ↵Cristian Medina2015-04-034-2/+22
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the API Updated projects.md to show tag_list field when performing GETs Updated projects_spec.rb to include check for tag_list key in project list Added changes to the CHANGELOG
* | | | | Merge branch 'fix-backup-spec-regexp' into 'master'Douwe Maan2015-04-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve regexp to prevent false positives If a filename happened to contain "db" and enough "rwx" characters before, then this test would previously fail. For example: ``` drwxr-xr-x gitlab-runner/gitlab-runner 0 2015-04-02 07:46 uploads/tmp/cassidy.stokes8477/gitlabhq/36d972fa55d6b44810fc6fd843473adb/ ``` Adding a space before the "db" match string tightens up the regexp and reduces the chance of an unintended match. See merge request !489
| * | | | | Improve regexp to prevent false positivesStan Hu2015-04-021-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a filename happened to contain "db" and enough "rwx" characters before, then this test would previously fail. For example: ``` drwxr-xr-x gitlab-runner/gitlab-runner 0 2015-04-02 07:46 uploads/tmp/cassidy.stokes8477/gitlabhq/36d972fa55d6b44810fc6fd843473adb/ ``` Adding a space before the "db" match string tightens up the regexp and reduces the chance of unintended match.
* | | | | Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-0318-15/+117
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support configurable attachment size in Application Settings page ### What does this MR do? This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page. ### Are there points in the code the reviewer needs to double check? What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid. ### Why was this MR needed? We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? See Issue #1258 ### Screenshots Before: ![Screen_Shot_2015-03-29_at_3.06.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6013a1dbc8cf61a63e93744149937fa0/Screen_Shot_2015-03-29_at_3.06.53_PM.png) After: ![Screen_Shot_2015-03-29_at_3.12.34_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f3518af7e8653ba40f0a3579456da6ad/Screen_Shot_2015-03-29_at_3.12.34_PM.png) See merge request !407
| * | | | Support configurable attachment size via Application SettingsStan Hu2015-04-0218-15/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
* | | | | Merge branch 'import-current-user' into 'master'Dmitriy Zaporozhets2015-04-028-37/+298
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace. Addresses #1347. Untested since I'm in a bit of a hurry. Will definitely have time to test and add unit tests before the 7.10 release :) See merge request !481
| * | | | | Add tests.import-current-userDouwe Maan2015-04-013-34/+281
| | | | | |
| * | | | | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user ↵Douwe Maan2015-03-315-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | into current namespace.
* | | | | | Merge branch 'repository-archive-worker' into 'master'Dmitriy Zaporozhets2015-04-0214-20/+360
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Archive repositories in background worker. Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/17 being merged, a new `gitlab_git` being released and this MR's `Gemfile.lock` being updated.. See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2173. To do after this is merged: Update https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb in omnibus. See merge request !436
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow username to end in period. The current behavior doesn't do username referencing and mentioning in sentences like "I discussed with with @douwe." since `douwe.` is matched as a username. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2174. See merge request !438
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to skip some items in backup https://dev.gitlab.org/gitlab/gitlabhq/issues/1936 Now it is possible to run ``` sudo gitlab-rake gitlab:backup:create SKIP=repositories,uploads ``` available options: repositories,uploads,db See merge request !470
| * | | | | | ability to skip some items in backupbackup_skip_optionValery Sizov2015-04-025-15/+119
|/ / / / / /
* | | | | | Merge branch 'rs-icon-symlink' into 'master'Douwe Maan2015-04-022-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check symlink mode as a String for file_type_icon_class The file mode for a symlink just got changed in `gitlab_git`, see https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69 See merge request !487
| * | | | | | Check symlink mode as a String for file_type_icon_classRobert Speicher2015-04-012-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69
* | | | | | Update CHANGELOG.Marin Jankovski2015-04-021-5/+4
| | | | | |
* | | | | | Update changelog for 7.9.2.Marin Jankovski2015-04-021-0/+2
|/ / / / /
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2015-03-312-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'no-chmod-r' into 'master'Dmitriy Zaporozhets2015-04-012-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use chmod_R for backup tars When creating backup tar files, only change permissions on the `db`, `uploads`, and `repositories` directories, not their contents. See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1716#note_40472 See merge request !1744
| | * | | | | Don't use chmod_R for backup tarsVinnie Okada2015-03-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating backup tar files, only change permissions on the `db`, `uploads`, and `repositories` directories, not their contents.
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-3121-101/+263
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/markdown.rb
| * \ \ \ \ \ \ Merge branch 'rs-issue-1340' into 'master'Dmitriy Zaporozhets2015-04-012-12/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unbind task item checkbox events and then rebind them Fixes #1340 This issue was caused by this line: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/projects/issues/update.js.haml#L17 `new Issue()` gets called on every JS-based issue update, and all the binds in the constructor get re-applied without first unbinding the existing ones. Right now my fix is *only* for the checkbox events, and I suspect there are similar issues still present for other events. See merge request !478
| | * | | | | | | Unbind task item checkbox events and then rebind themRobert Speicher2015-03-312-12/+4
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Fixes #1340
| * | | | | | | Merge branch 'group-information-leak' into 'master'Dmitriy Zaporozhets2015-04-015-7/+137
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't leak private group existence by redirecting from namespace controller to group controller. See merge request !440