Marin Jankovski
019ffd9a59
Version 7.8.4
2015-03-11 15:15:56 -07:00
Marin Jankovski
e500b437b6
Update changelog for 7.8.4.
2015-03-11 13:02:49 -07:00
Marin Jankovski
2c7565ecfc
Merge branch 'release/7-8-4' into '7-8-stable'
...
Release/7 8 4
See merge request !1678
2015-03-11 20:00:25 +00:00
Dmitriy Zaporozhets and Marin Jankovski
956a392a21
Merge branch 'fix_importers' into 'master'
...
Fix importers with OCC
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1180
Using validates_uniqueness_of does not guarantee the absence of duplicate record insertions. When users click button "import all" it will create duplicating group in database and data integrity will be broken.
http://api.rubyonrails.org/classes/ActiveRecord/Validations/ClassMethods.html#method-i-validates_uniqueness_of
I use optimistic concurrency control for handling this situation.
See merge request !1647
Conflicts:
db/schema.rb
2015-03-11 11:31:15 -07:00
Dmitriy Zaporozhets and Marin Jankovski
e4d843a768
Merge branch 'issues_url' into 'master'
...
Remove placeholder methods to prevent calling methods rather than attributes.
Since we have https://dev.gitlab.org/gitlab/gitlabhq/blob/7-8-stable/app/models/service.rb#L79 makes no sense to have methods as a placeholder.
See merge request !1676
2015-03-11 11:01:54 -07:00
Marin Jankovski and Marin Jankovski
957a0e45c1
Merge branch 'issues-tracker-id' into 'master'
...
Properly move over `issues_tracker_id` from old custom issue tracker URLs.
Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1124 .
cc @marin Regression in 7.8.0.
See merge request !1670
2015-03-11 10:59:59 -07:00
Marin Jankovski
abea07013a
Version 7.8.3
2015-03-09 23:33:43 -07:00
Marin Jankovski
294a03c168
Update changelog for 7.8.3
2015-03-09 20:41:36 -07:00
Marin Jankovski
9b6dde0d87
Merge branch 'release/7-8-3' into '7-8-stable'
...
Release 7.8.3
Bump gitlab_git to fix 500 with annotated tags w/o message
Should fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1181
See merge request !1666
2015-03-10 03:28:48 +00:00
Dmitriy Zaporozhets and Marin Jankovski
4610c3120f
Merge branch 'bump_gitlab_git' into 'master'
...
Bump gitlab_git to fix 500 with annotated tags w/o message
Should fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1181
See merge request !1640
Conflicts:
Gemfile
Gemfile.lock
2015-03-09 19:10:29 -07:00
Marin Jankovski
dbdc1a66d8
Version 7.8.2
2015-03-04 16:25:27 -08:00
Marin Jankovski
79aed7ca60
Merge branch 'release/7-8-2' into '7-8-stable'
...
WIP | Release/7 8 2
See merge request !1629
2015-03-04 21:32:02 +00:00
Marin Jankovski
56f75bde48
Update changelog.
2015-03-04 10:16:13 -08:00
Dmitriy Zaporozhets and Marin Jankovski
520a49d325
Merge branch 'case-sensetivity-import' into 'master'
...
Fix import check for case sensetive namespaces
If you already have namespace `ABc` and you try to import project with namespace `abC` - import will fail with 422 error.
cc @valery
See merge request !1618
2015-03-04 10:15:02 -08:00
Marin Jankovski
63e74ce9d6
Update the Changelog.
2015-03-04 09:51:30 -08:00
Marin Jankovski
1be453d66b
User correct name for reject_blocked
2015-03-03 16:15:25 -08:00
Dmitriy Zaporozhets and Marin Jankovski
650a7c73c4
Merge branch 'project-existence-leak' into 'master'
...
Don't leak information about private project existence via Git-over-SSH/HTTP.
Fixes #2040 and https://gitlab.com/gitlab-org/gitlab-ce/issues/343 .
Both `Grack::Auth` (used by Git-over-HTTP) and `Api::Internal /allowed` (used by gitlab-shell/Git-over-SSH) now return a generic "Not Found" error when the project exists but the user doesn't have access to it.
See merge request !1578
2015-03-03 14:56:31 -08:00
Dmitriy Zaporozhets and Marin Jankovski
c0f8b95655
Merge branch 'fix_gitlab_importer' into 'master'
...
Fix GitLab && Gitorious importers. Hide already imported projects
Fixes #2060
See merge request !1594
2015-03-03 14:55:22 -08:00
Dmitriy Zaporozhets and Marin Jankovski
d59d4d4145
Merge branch 'projects-limit-default' into 'master'
...
Correctly set default projects limit for new users.
See #2014 .
Note that the projects limit still isn't retroactively applied to existing users (probably as intended)
See merge request !1547
2015-03-03 14:51:52 -08:00
Dmitriy Zaporozhets and Marin Jankovski
56475ae9bc
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-03-03 14:49:42 -08:00
Robert Schilling
c94e6d4830
Merge pull request #8867 from volker-fr/7-8-stable
...
Update gitlab-shell version in installation and update documentation
2015-02-25 23:28:23 +01:00
Volker Uhrig
358f1c066d
Update gitlab-shell version in installation and update documentation
...
installation was totally off compared to the update document. The update
document was slightly off (rake gitlab:check excpects 2.5.4 and not
2.5.3)
2015-02-25 16:55:30 -05:00
Marin Jankovski
e2d785c361
Version 7.8.1
2015-02-24 13:51:48 -08:00
Dmitriy Zaporozhets and Marin Jankovski
eb4845f4f3
Fix access to attachments uploaded with 'Choose file' button for public
...
access
2015-02-24 12:36:17 -08:00
Dmitriy Zaporozhets
b313c8f512
Merge branch '7-8-stable' of github.com:gitlabhq/gitlabhq into 7-8-stable
2015-02-23 23:30:41 -08:00
Dmitriy Zaporozhets
3c858eff0c
Allow non authenticated access to avatars
2015-02-23 23:28:50 -08:00
Douwe Maan and Dmitriy Zaporozhets
7257940c52
LDAP users don't need to set a password to Git over HTTP.
2015-02-23 23:28:34 -08:00
Dmitriy Zaporozhets
9b7633f10b
Make services migration more reliable
2015-02-23 23:28:05 -08:00
Dmitriy Zaporozhets and Dmitriy Zaporozhets
769fe73e5b
Merge branch 'bump-gitlab-shell-2-5-4' into 'master'
...
Bump gitlab-shell to 2.5.4
For #2042
See merge request !1584
2015-02-23 23:27:34 -08:00
Dmitriy Zaporozhets
c2788e4aa9
Merge branch 'url_links_with_relative_url' into '7-8-stable'
...
Fix links to issues if instance is using relative urls.
Fix for https://github.com/gitlabhq/gitlabhq/issues/8767
See merge request !1574
2015-02-24 06:53:19 +00:00
Marin Jankovski
6327dd0e9d
Fix links to issues if instance is using relative urls.
2015-02-23 16:40:55 -08:00
Patrik Kernstock and Robert Schilling
12bdfe37da
Update 7.7-to-7.8.md
2015-02-23 18:40:28 +01:00
Robert Schilling
825919aa99
Update gitlab-shell to 2.5.3 in 7-8 update guide, fixes #8838
2015-02-22 14:21:16 +01:00
Marin Jankovski
bcc8dbd065
Version 7.8.0
2015-02-21 21:23:15 -08:00
Marin Jankovski
a75d36996e
Version 7.8.0.rc6
2015-02-21 19:04:01 -08:00
Marin Jankovski
556f183542
Version 7.8.0.rc5
2015-02-21 10:31:58 -08:00
Marin Jankovski
ec1c71d813
Merge branch '7-8-rc5' into '7-8-stable'
...
Changes for 7.8 RC5
See merge request !1566
2015-02-21 18:26:54 +00:00
Marin Jankovski and Marin Jankovski
ccac5c96a0
Merge branch 'static-middleware' into 'master'
...
Change check to only swap static middleware when it's enabled.
Fixes problem with #1553 .
cc @marin
See merge request !1565
2015-02-21 09:53:52 -08:00
Dmitriy Zaporozhets
ebb560ca8d
Version 7.8.0.rc4
2015-02-20 16:40:01 -08:00
Dmitriy Zaporozhets
3985798f95
Merge branch '7-8-rc4' into '7-8-stable'
...
Changes for 7.8.rc4
See merge request !1564
2015-02-21 00:17:59 +00:00
Marin Jankovski and Dmitriy Zaporozhets
dd9d17a6e3
Merge branch 'upload-xss-access-control' into 'master'
...
Fix note attachments XSS and access control
Replaces the reverted #1528 , as proposed in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/434 , as discussed with @dzaporozhets and as summarized in #2032 .
@marin Could you take a look at the nginx config and apply it to Omnibus once this gets merged?
See merge request !1553
2015-02-20 14:49:07 -08:00
Stefan Tatschner and Dmitriy Zaporozhets
c9a676f77d
Add missing color codes for line anchors, fixes #8628
2015-02-20 14:47:53 -08:00
Marcin Kulik and Dmitriy Zaporozhets
fcabff63f2
Add gitorious.org importer
2015-02-20 14:47:38 -08:00
Dmitriy Zaporozhets and Dmitriy Zaporozhets
3360ee876a
Merge branch 'improve-web-hooks' into 'master'
...
Improve web hooks
* add git_http_url and git_ssh_url to project web hook
* add visibility_level to project web hook
* add documentation about project visibility_level in API
Fixes #2018 , #2030
cc @sytse
See merge request !1560
2015-02-20 14:45:26 -08:00
Dmitriy Zaporozhets
b4d3f11505
Bump gitlab-shell version
2015-02-19 12:04:11 -08:00
Dmitriy Zaporozhets
b5c29922c0
Version 7.8.0.rc3
2015-02-19 09:45:53 -08:00
Dmitriy Zaporozhets
e18d55d279
Fix trending projects ordering
2015-02-19 09:31:05 -08:00
Dmitriy Zaporozhets
6a6ffbe15b
Fix user page performance and authorization
...
Conflicts:
app/models/user.rb
2015-02-19 09:31:05 -08:00
Marin Jankovski
0fbf5e1300
Version 7.8.0.rc2
2015-02-18 22:19:27 -08:00
Dmitriy Zaporozhets
dcbe9cd3ba
Merge branch '7-8-rc2' into '7-8-stable'
...
Code from master to 7-8-stable for RC2
See merge request !1544
2015-02-19 01:31:28 +00:00
