Douwe Maan
317206300d
Merge branch 'configurable-attachment-size' into 'master'
...
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:
After:
See merge request !407
2015-04-03 08:47:55 +00:00
Stan Hu
dfd256f29e
Support configurable attachment size via Application Settings
...
Fix bug where error messages from Dropzone would not be displayed on the issues page
Closes #1258
2015-04-02 00:04:08 -07:00
Douwe Maan
45ee9009f5
Fix migration SQL.
2015-03-31 23:42:49 +02:00
Douwe Maan
175f7f68a6
Move files for moved namespaces.
2015-03-31 09:30:34 +02:00
Douwe Maan
5f93b0e3da
Don't allow username to end in period.
2015-03-27 11:10:56 +01:00
Douwe Maan
f3650d2e5d
Add migration.
2015-03-24 17:00:56 +01:00
Dmitriy Zaporozhets
6ef20926ee
Add location to user profile
2015-03-20 16:52:23 -07:00
Hannes Rosenögger
9e5738b007
Extend the commit calendar to show the actual commits for a date
2015-03-18 08:42:42 +01:00
Dmitriy Zaporozhets
9162e34bb0
Merge branch 'issue_subscription' into 'master'
...
Subscription to issue/mr
Fixes #1911 and #1909
See merge request !1702
2015-03-17 16:45:04 +00:00
Valery Sizov
1b437ec349
tests
2015-03-16 21:38:41 +02:00
Valery Sizov
f53683e67f
fix specs
2015-03-16 16:51:49 +02:00
Valery Sizov
410d25c8ca
rename table subscribe; make it polymorfic
2015-03-16 15:22:50 +02:00
Valery Sizov
09ef69b7c8
code folding fix
2015-03-16 13:52:55 +02:00
Valery Sizov
9698b36c1c
Subscription
2015-03-15 19:44:59 +02:00
Vinnie Okada
ad0ca0499a
Merge branch 'master' into fix-restricted-visibility
...
Conflicts:
db/schema.rb
2015-03-14 10:49:11 -06:00
Valery Sizov
02ed61c4db
remove duplication
2015-03-10 20:09:34 +02:00
Valery Sizov
ed4c7190ed
Fix importers with OCC
2015-03-10 12:23:11 +02:00
Dmitriy Zaporozhets
27e3b47b7f
Fix user fixtures for development
2015-03-08 17:35:49 -07:00
Vinnie Okada
cacac147de
Move restricted visibility settings to the UI
...
Add checkboxes to the application settings page for restricted
visibility levels, and remove those settings from gitlab.yml.
2015-03-07 13:11:08 -07:00
Stan Hu
7e204cf389
Added comment notification events to HipChat and Slack services.
...
Supports four different event types all bundled under the "note" event type:
- comments on a commit
- comments on an issue
- comments on a merge request
- comments on a code snippet
2015-03-06 06:54:00 -08:00
Stan Hu and Douwe Maan
afe5d7d209
Issue #595 : Support Slack notifications upon issue and merge request events
...
1) Adds a DB migration for all services to toggle on push, issue, and merge events.
2) Upon an issue or merge request event, fire service hooks.
3) Slack service supports custom messages for each of these events. Other services
not supported at the moment.
4) Label merge request hooks with their corresponding actions.
2015-03-03 11:14:31 +01:00
Dmitriy Zaporozhets
a9eba1bde0
No need to block db:rollback for safe migration
2015-02-25 19:51:13 -08:00
Dmitriy Zaporozhets
78391fe5a0
Merge branch 'fix-another-migration' into 'master'
...
Prevent another migration from failing due to indirect use of model columns not yet created
See https://github.com/gitlabhq/gitlabhq/issues/8817#issuecomment-76007077
cc @marin
See merge request !1597
2015-02-26 02:53:37 +00:00
Douwe Maan
4803af45df
Prevent another migration from failing.
2015-02-25 22:55:37 +01:00
Dmitriy Zaporozhets
a52529f9b6
Merge branch 'bitbucket-import'
...
Conflicts:
app/views/import/gitorious/status.html.haml
db/schema.rb
2015-02-25 09:21:45 -08:00
Dmitriy Zaporozhets
2cd2543c44
Merge branch 'mwessel/gitlab-ce-set-last-activity-at' into 'master'
...
Give last_activity_at a default value so it will always be set
For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/345
See merge request !1589
2015-02-24 23:15:04 +00:00
Douwe Maan
ad6d623234
Add Bitbucket importer.
2015-02-24 15:07:24 +01:00
Dmitriy Zaporozhets
0f6221e736
Make services migration more reliable
2015-02-23 17:56:05 -08:00
Marco Wessel
b19b8c679a
Give last_activity_at a default value so it will always be set
2015-02-23 03:36:21 +01:00
Dmitriy Zaporozhets
8184a65644
Revert "Fix broken access control and refactor avatar upload"
...
This reverts commit 7d5f86f6cb
2015-02-19 08:57:35 -08:00
Dmitriy Zaporozhets
55a906f643
Merge branch 'fix_access_control_notes' into 'master'
...
Fix broken access control for note attachments
From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/332 by Hannes Rosenögger.
See merge request !1528
2015-02-17 18:05:12 +00:00
Dmitriy Zaporozhets
2c893cb380
Fix dev fixture for admin
2015-02-17 00:23:09 -08:00
Hannes Rosenögger and Douwe Maan
7d5f86f6cb
Fix broken access control and refactor avatar upload
...
This commit moves the note folder from
/public/uploads/note
to
/uploads/note
and changes the uploader accordingly.
Now it's no longer possible to avoid the access control by modifing the url.
The Avatar upload has been refactored to use an own uploader as well
to cleanly seperate the two upload types.
2015-02-16 20:10:15 +01:00
Dmitriy Zaporozhets
2ad00f5294
Merge branch 'tweet-new-project'
...
Conflicts:
db/schema.rb
2015-02-15 19:03:10 -08:00
Douwe Maan
25e44d0530
Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).
2015-02-13 14:44:42 +01:00
Douwe Maan
ce08f919bf
Add link to share via twitter to "created project" event.
2015-02-13 12:07:59 +01:00
Dmitriy Zaporozhets
2be3a012ff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-02-12 14:43:02 -08:00
Jeroen van Baarsen
d9f84f6867
Merge pull request #8445 from jvanbaarsen/project-spec-speed-up
...
requests/api/project_spec.rb speed up
2015-02-12 11:26:09 +01:00
Marin Jankovski
09d3d351a1
Remove not null constraint on project_id in services.
2015-02-11 09:47:21 -08:00
Marin Jankovski
5515366064
Add template boolean to services.
2015-02-11 09:24:40 -08:00
Dmitriy Zaporozhets
aaa7a065c6
Add index on order columns for services table
2015-02-09 14:21:52 -08:00
Dmitriy Zaporozhets
3cd036e315
Merge branch 'notification_email'
...
Conflicts:
db/schema.rb
2015-02-07 18:42:34 -08:00
Douwe Maan
9dbd7e5aec
Allow notification email to be set separately from primary email.
...
Closes #1932 .
2015-02-07 23:19:17 +01:00
Dmitriy Zaporozhets
3e97ac2022
Add index on order columns
2015-02-06 10:21:48 -08:00
Dmitriy Zaporozhets
dbca8c9758
Add timestamps to identity
2015-02-05 13:23:32 -08:00
Jeroen van Baarsen
0ef495734d
Improved speed of the project_spec.rb
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com >
2015-02-03 18:26:17 +01:00
Marco Wessel
20e269cb92
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection
...
Conflicts:
CHANGELOG
db/schema.rb
2015-01-30 00:16:24 +01:00
Valery Sizov
54f6d8c7b5
an ability to clone project with oauth2 token
2015-01-28 15:57:31 -08:00
Marco Wessel
b20fc14133
Fix indentation
2015-01-25 18:34:02 +01:00
Marco Wessel
aad6ceaef9
Allow configuring protection of the default branch upon first push
2015-01-25 17:09:10 +01:00
Douwe Maan
Stan Hu
Dmitriy Zaporozhets
Hannes Rosenögger
Dmitriy Zaporozhets
Valery Sizov
Vinnie Okada
Marco Wessel
Hannes RosenöggerandDouwe Maan
Jeroen van Baarsen
Marin Jankovski
Valery Sizov
