summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Allow projects to be imported from Google Code.Douwe Maan2015-04-031-0/+6
|
* Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-031-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-0/+1
| | | | | | | | | | | | Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
* | Limit number of concurrent archive_repo jobs to 2.Douwe Maan2015-03-311-0/+2
|/
* Missing dot.Achilleas Pipinellis2015-03-301-1/+1
|
* Update documentation on issue closing pattern.Achilleas Pipinellis2015-03-301-1/+1
|
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-291-131/+0
|\
| * update acts-as-taggable-onNihad Abbasov2015-03-291-131/+0
| |
* | Merge branch 'remove_external_trackers_from_yml' into 'master'Dmitriy Zaporozhets2015-03-291-29/+0
|\ \ | |/ |/| | | | | | | | | | | We've moved external trackers to service, remove from gitlab.yml. Fixes #1937 See merge request !1743
| * We've moved external trackers to service, remove from gitlab.yml.Marin Jankovski2015-03-271-29/+0
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-271-0/+5
|\ \ | |/ |/|
| * Add autocomplete controllerDmitriy Zaporozhets2015-03-261-0/+5
| |
* | Add a note about not adding new setting options to gitlab.yml.Marin Jankovski2015-03-261-0/+5
|/
* Reduce Rack Attack false positives by clearing out auth failure count uponStan Hu2015-03-242-0/+4
| | | | | | | | successful Git over HTTP authentication. Add logging when a ban goes into effect for debugging. Issue #1171
* Restyle oauth accounts at profile page and add ability to unlink accountimprove-profileDmitriy Zaporozhets2015-03-211-1/+5
|
* Fix typo.Marin Jankovski2015-03-201-1/+1
|
* Change the name of the key used for bitbucket importer.Marin Jankovski2015-03-201-1/+1
|
* Fix commits routingDmitriy Zaporozhets2015-03-201-2/+1
|
* Fix commits routing for branches with slashfix-commits-routingDmitriy Zaporozhets2015-03-201-11/+20
|
* Revert "Increase timeout for Git-over-HTTP requests."Dmitriy Zaporozhets2015-03-192-12/+16
| | | | | | | This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9. Conflicts: Gemfile
* Remove signout flash message because it also makes no sense.remove-signin-flashDmitriy Zaporozhets2015-03-191-2/+2
| | | | You get redirected after signuout to gitlab.com and see this message on login page which makes no sense.
* Remove success signin message by deviseDmitriy Zaporozhets2015-03-181-1/+1
| | | | | | | | I find it really annoying every time I login into GitLab it shows me that I successfully signed in. But this makes no sense to me. I already see dashboard and dont see login screen. Its obvious I signed in successfully. Instead it just show annyoing message every time taking part of space on my screen.
* Extend the commit calendar to show the actual commits for a dateHannes Rosenögger2015-03-181-1/+4
|
* Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets2015-03-171-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | Subscription to issue/mr Fixes #1911 and #1909 ![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png) ![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png) See merge request !1702
| * testsValery Sizov2015-03-161-2/+2
| |
| * SubscriptionValery Sizov2015-03-151-0/+4
| |
* | Merge branch 'fix-restricted-visibility' into 'master'Dmitriy Zaporozhets2015-03-161-4/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restricted visibility levels - bug fix and new feature This allows admin users to override restricted visibility settings when creating and updating projects and snippets, and moves the restricted visibility configuration from gitlab.yml to the web UI. See #1903. ## Move configuration location I added a new section to the application settings page for restricted visibility levels. Each level has a checkbox, styled with Bootstrap to look like a toggle button. A checked box means that the level is restricted. I added a glowing text shadow and changed the background color for checked buttons because the default styles made it hard to distinguish between checked and unchecked. This image shows the new section with the "Public" box checked: ![restricted_visibility_settings](https://dev.gitlab.org/Okada/gitlabhq/uploads/629562e4313f89b795e81c3bb0f95893/restricted_visibility_settings.png) ## Allow admins to override To allow admin users to override the restricted visibility levels, I had to remove the `visibility_level` validation from the `Project` class. The model doesn't know about the `current_user`, which should determine whether the restrictions can be overridden. We could use the creator in the validation, but that wouldn't work correctly for projects where a non-admin user is the creator and an admin tries to change the project to a restricted visibility level. The `Project::UpdateService` and `Project::CreateService` classes already had code to determine whether the current user is allowed to use a given visibility level; now all visibility level validation is done in those classes. Currently, when a non-admin tries to create or update a project using a restricted level, these classes silently set the visibility level to the global default (create) or the project's existing value (update). I changed this behavior to be more like an Active Model validation, where using a restricted level causes the entire request to be rejected. Project and personal snippets didn't have service classes, and restricted visibility levels weren't being enforced in the model or the controllers. The UI disabled radio buttons for restricted levels, but that wouldn't be difficult to circumvent. I created the `CreateSnippetService` and `UpdateSnippetService` classes to do the same restricted visibility check that the project classes do. And since I was dealing with snippet visibility levels, I updated the API endpoints for project snippets to allow users to set and update the visibility level. ## TODO * [x] Add more tests for restricted visibility functionality cc @sytse @dzaporozhets See merge request !1655
| * \ Merge branch 'master' into fix-restricted-visibilityVinnie Okada2015-03-146-14/+24
| |\ \ | | | | | | | | | | | | | | | | Conflicts: db/schema.rb
| * | | Move restricted visibility settings to the UIVinnie Okada2015-03-071-4/+0
| | | | | | | | | | | | | | | | | | | | Add checkboxes to the application settings page for restricted visibility levels, and remove those settings from gitlab.yml.
* | | | Move group leave action from dashboard/groups to groups/group_members.Douwe Maan2015-03-151-5/+2
| | | |
* | | | Move group members index from `/members` to `/group_members`.Douwe Maan2015-03-151-2/+3
| | | |
* | | | Move project members index from `/team` to `/project_members`Douwe Maan2015-03-151-1/+0
| | | |
* | | | Use `project_member` instead of `team_member`.Douwe Maan2015-03-151-2/+2
| |/ / |/| |
* | | Change default number of unicorn workers to three.Marin Jankovski2015-03-131-1/+1
| |/ |/|
* | Merge branch 'markdown-smb-link' into 'master'Dmitriy Zaporozhets2015-03-121-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Allow smb:// links in Markdown text. As requested by Sam McLeod at https://gitlab.com/gitlab-org/gitlab-ce/issues/1184 See merge request !1669
| * | Allow smb:// links in Markdown text.Douwe Maan2015-03-101-0/+2
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-112-0/+2
|\ \ \
| * | | Make email display name configurableVyacheslav Slinko2015-03-112-0/+2
| |/ /
* | | Remove projects page from dashboardDmitriy Zaporozhets2015-03-101-1/+0
|/ /
* | Add starred projects page to dashboardDmitriy Zaporozhets2015-03-091-0/+6
| |
* | Merge branch 'dashboard-groups' into 'master'Dmitriy Zaporozhets2015-03-091-5/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | Move profile groups page to dashboard For #2069 See merge request !1654
| * | Move profile groups page to dashboardDmitriy Zaporozhets2015-03-081-5/+6
| | |
* | | Merge branch 'smtp_example_update' into 'master'Marin Jankovski2015-03-091-1/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Add link to smtp documentation. Closes #2070 See merge request !1627
| * | Add link to smtp documentation.Marin Jankovski2015-03-041-1/+4
| | |
* | | Add GitLab UI development kitDmitriy Zaporozhets2015-03-081-6/+3
| |/ |/|
* | Merge branch 'timeout' into 'master'Dmitriy Zaporozhets2015-03-052-16/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase timeout for Git-over-HTTP requests. Fixes #2081 and https://gitlab.com/gitlab-org/gitlab-ce/issues/232. Normal web requests are bound by the `Rack::Timeout` timeout of 60 seconds, while Grack Git-over-HTTP requests are only bound by Unicorn's timeout which is now set to 1 hour, which should be plenty. The omnibus package should be updated to no longer use `unicorn['worker_timeout']` for the Unicorn timeout, but to set the `Slowpoke.timeout`. See merge request !1619
| * | Increase timeout for Git-over-HTTP requests.Douwe Maan2015-03-042-16/+12
| |/
* | Add dashboard milestones.Douwe Maan2015-03-031-1/+5
|/
* Merge pull request #8349 from divineforest/cleanup-assets-compressDmitriy Zaporozhets2015-03-021-3/+3
|\ | | | | Remove useless `assets.compress` option, Rails 4 uses only `assets.js_co...
| * Remove useless `assets.compress` option, Rails 4 uses only ↵Alexander Balashov2014-11-181-3/+3
| | | | | | | | | | `assets.js_compressor` > The config.assets.compress option should be changed to config.assets.js_compressor like so for instance