summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Clean up code.Douwe Maan2015-04-037-27/+48
|
* Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-0311-29/+202
|
* Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-038-11/+35
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-028-11/+35
| | | | | | | | | | | | 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-023-3/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user ↵Douwe Maan2015-03-313-3/+12
| | | | | | | | | | | | into current namespace.
* | | Merge branch 'repository-archive-worker' into 'master'Dmitriy Zaporozhets2015-04-024-13/+107
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Add tests.Douwe Maan2015-03-313-7/+6
| | | |
| * | | Small code cleanup.Douwe Maan2015-03-312-17/+8
| | | |
| * | | Archive repositories in background worker.Douwe Maan2015-03-314-10/+114
| |/ /
* | | Merge branch 'username-period' into 'master'Dmitriy Zaporozhets2015-04-025-41/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Move files for moved namespaces.Douwe Maan2015-03-311-4/+0
| | | |
| * | | Don't allow username to end in period.Douwe Maan2015-03-271-1/+1
| | | |
| * | | Use more specific regexes.Douwe Maan2015-03-275-13/+13
| | | |
| * | | Move User.cleanup_username to Namespace.cleanup_path.Douwe Maan2015-03-272-28/+31
| | | |
* | | | Check symlink mode as a String for file_type_icon_classRobert Speicher2015-04-011-1/+1
| |_|/ |/| | | | | | | | See https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-3115-81/+88
|\ \ \ | | | | | | | | | | | | | | | | 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-012-6/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't leak private group existence by redirecting from namespace controller to group controller. See merge request !440
| | * | | Don't leak private group existence by redirecting from namespace controller ↵Douwe Maan2015-03-242-6/+14
| | | | | | | | | | | | | | | | | | | | to group controller.
| * | | | Merge branch 'admin-user-projects' into 'master'Dmitriy Zaporozhets2015-04-013-5/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix admin user projects lists. The admin user personal projects lists wasn't being rendered anymore. cc @marin See merge request !442
| | * | | | Fix admin user projects lists.admin-user-projectsDouwe Maan2015-03-313-5/+7
| | |/ / /
| * | | | Merge branch 'refactor-milestones' into 'master'Dmitriy Zaporozhets2015-04-017-57/+62
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better looking milestone lists ### Before ![milestone-before](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1366ade74d76b067fdc8707d31d2bffc/milestone-before.png) ### After ![milestone-after](https://gitlab.com/gitlab-org/gitlab-ce/uploads/80ae1c1f77eae5dff8ee61c4271bec17/milestone-after.png) See merge request !484
| | * | | Better looking milestone listsDmitriy Zaporozhets2015-04-017-57/+62
| | | | |
| * | | | Merge branch 'file-commit-list' into 'master'Douwe Maan2015-03-311-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue where only 25 commits would load in file listings Fixes #1310 See https://gitlab.com/gitlab-org/gitlab-ce/tree/master and it will only show the first 25 files commit messages. See merge request !477
| | * | | Fixed issue where only 25 commits would load in file listingsPhil Hughes2015-03-301-1/+1
| | | | |
* | | | | Merge branch 'email-full-url'Marin Jankovski2015-03-318-18/+53
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use relative URL for Markdown references, except in mails.email-full-urlDouwe Maan2015-03-278-11/+47
| | | | |
| * | | | Return full URLs from GitLabIssueTrackerService.Douwe Maan2015-03-271-10/+9
| | |_|/ | |/| |
* | | | Better legend for contribution calendar pt2 :)Dmitriy Zaporozhets2015-03-311-1/+1
| | | |
* | | | Better legend for contribution calendarDmitriy Zaporozhets2015-03-311-3/+3
| | | |
* | | | Merge branch 'commits-count-badge' into 'master'Dmitriy Zaporozhets2015-03-301-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added badge to commits tab Fixes #1261 See merge request !465
| * | | | Added badge to commits tabPhil Hughes2015-03-301-1/+3
| | | | |
* | | | | Fix adding new members to groupDmitriy Zaporozhets2015-03-301-1/+1
| |_|/ / |/| | |
* | | | Refactor star btn logic for non-logged in user and fix testsDmitriy Zaporozhets2015-03-292-14/+19
| | | |
* | | | Refactor star/fork buttonsDmitriy Zaporozhets2015-03-295-24/+47
| | | |
* | | | Merge branch 'file-type' of https://github.com/Soullivaneuh/gitlabhq into ↵Dmitriy Zaporozhets2015-03-297-8/+61
|\ \ \ \ | | | | | | | | | | | | | | | Soullivaneuh-file-type
| * | | | Improve file icons rendering on treeSullivan SENECHAL2015-03-287-8/+61
| | | | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-296-46/+32
|\ \ \ \ \
| * \ \ \ \ Merge branch 'repo-buttons' into 'master'Dmitriy Zaporozhets2015-03-295-45/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repo buttons Fixes #796 Moved the star & fork button to inline with the other buttons. See merge request !473
| | * | | | | Alignment fixes for repo buttonsPhil Hughes2015-03-294-11/+18
| | | | | | |
| | * | | | | Moved download button into sidebarPhil Hughes2015-03-292-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Star and fork buttons moved up
| | * | | | | Changed button typePhil Hughes2015-03-272-3/+3
| | | | | | |
| | * | | | | Fork/Star button re-designPhil Hughes2015-03-264-44/+17
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'clear-note-form-on-succcess' into 'master'Dmitriy Zaporozhets2015-03-291-1/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent note form from being cleared when submitting failed. When you try to submit a comment while you're not connected to the internet or while your connection is having trouble, the AJAX request would fail and the note would be deleted :cry: See merge request !468
| | * | | | | Prevent note form from being cleared when submitting failed.clear-note-form-on-succcessDouwe Maan2015-03-271-1/+8
| | | |_|/ / | | |/| | |
* | | | | | Merge pull request #9040 from tsigo/rs-refactor-nav-collapseDmitriy Zaporozhets2015-03-291-8/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Refactor sidebar JS logic
| * | | | | Simplify toggle-nav-collapse JSRobert Speicher2015-03-271-8/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-291-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
View Lorry Controller Status