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
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
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
aad6ceaef9
Allow configuring protection of the default branch upon first push
2015-01-25 17:09:10 +01:00
Steven Thonus and Hannes Rosenögger
42bac7f9f2
adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix
2015-01-24 18:51:16 +01:00
Dmitriy Zaporozhets
41d7be3ce1
Allow to specify home page for non logged-in users
2015-01-16 16:01:15 -08:00
Dmitriy Zaporozhets
bb1f8b1d8b
Merge branch 'github_importer'
...
Conflicts:
app/helpers/projects_helper.rb
2015-01-13 10:35:16 -08:00
Valery Sizov and Valery Sizov
a9f7fd2c1a
Github Importer
2015-01-10 09:51:43 -08:00
Dmitriy Zaporozhets
8589b4e137
Init ApplicationSettings resource with defaults from config file
2015-01-08 00:22:50 -08:00
Marin Jankovski
42fb42aed4
Merge branch 'master' into developer_can_push_to_protected_branches_option
...
Conflicts:
db/schema.rb
2014-12-29 09:30:55 +01:00
Marin Jankovski
6ce3b1a311
Add migration for developers can push to protected branches flag.
2014-12-26 09:07:02 +01:00
Valery Sizov
e41dadcb33
Doorkeeper integration
2014-12-24 15:38:07 +02:00
Dmitriy Zaporozhets
1440ac8154
Remove index only if exists
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-23 11:05:50 +02:00
Dmitriy Zaporozhets
031461e106
Fix migration issue for mysql with index not being removed
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-23 10:52:21 +02:00
Valery Sizov
7d8dfccf70
speed up migration to identities
2014-12-08 15:15:11 +02:00
Dmitriy Zaporozhets
1961b59070
Add locked_at to merge request
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-05 15:42:26 +02:00
Valery Sizov
3a5ed5260b
Supporting for multiple omniauth provider for the same user
2014-12-04 13:03:55 +02:00
Valery Sizov
1a80d13a39
Multi-provider auth. LDAP is not reworked
2014-12-04 13:01:50 +02:00
Jacob Vosmaer
4053c055be
Add missing timestamps to the 'members' table
2014-11-21 15:02:23 +01:00
Dmitriy Zaporozhets
ff48e1eeb7
Save only valid record in service migrations
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-31 11:12:41 +02:00
Drew Blessing
c3104abfd4
Fix serialize migration
2014-10-30 05:01:21 -05:00
Valery Sizov
47f539f5a6
Snippets: public/internal/private
2014-10-09 17:09:53 +03:00
Marin Jankovski
eceef546d1
Add slack service migration.
2014-10-06 16:50:24 +02:00
Dmitriy Zaporozhets
1aa48174db
Fix STI+polymorphic for Group <-> GroupMember
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-14 21:52:54 +03:00
Dmitriy Zaporozhets
13af7de941
Fix migration and association for new members table
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-14 20:38:57 +03:00
Dmitriy Zaporozhets
e9b32005eb
Migrate old membership objects to new Member model
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-14 18:09:23 +03:00
Dmitriy Zaporozhets
3503b504ea
Add members table migration
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-14 17:18:58 +03:00
Drew Blessing
09cdd94322
Fix serialize migration. Fixes #7734
2014-09-11 18:41:03 -05:00
Dmitriy Zaporozhets
6135eb0adf
Merge pull request #7705 from dblessing/serialize_service_properties
...
Serialize service properties
2014-09-10 20:47:47 +03:00
Drew Blessing
a0dbcd2365
Serialize services properties
2014-09-10 09:56:39 -05:00
Jacob Vosmaer
042465c448
Use create-hooks instead of rewrite-hooks.sh
...
The rewrite-hooks.sh script is a deprecated wrapper for gitlab-shell's
create-hooks script.
2014-09-08 10:16:15 +02:00
Dmitriy Zaporozhets
6f423b987f
Update repos hooks in migration
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-03 17:10:41 +03:00
James Brooks
63e25c2bb4
Fixes #7571
2014-08-27 21:12:37 +01:00
Jacob Vosmaer
30ba7aea19
Document characters being stripped from labels
2014-08-20 09:56:49 +02:00
Jacob Vosmaer
dfc5bf6bf7
Use the default color when migrating labels
2014-08-19 17:43:17 +02:00
Jacob Vosmaer
e354e548b9
Remove invalid characters from the label name
2014-08-19 17:42:55 +02:00
Jacob Vosmaer
7e0a2b3b3d
Test if the label is valid before creating link
2014-08-19 17:42:34 +02:00
Dmitriy Zaporozhets
cc33168459
Add indicies to labels
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-07-30 14:25:27 +03:00
Dmitriy Zaporozhets
d45a6b2941
Migrate issue/mr labels from act_as_taggable to own labels
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-07-29 19:19:26 +03:00
Dmitriy Zaporozhets
6fb9badcae
Replace project labels with tags to prevent name conflict with GitLab labels
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-07-29 18:23:18 +03:00