8419 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 490f99d45e New stable branches and update guide
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.6.0
2014-02-21 17:07:43 +02:00
Dmitriy Zaporozhets 1a3527f6e7 Version to 6.6.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-21 17:02:38 +02:00
Dmitriy Zaporozhets bbd92f554d Limit huge images in diff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-21 16:32:42 +02:00
Dmitriy Zaporozhets 138e2a50b7 PostgreSQL is first one now
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 15:16:33 +02:00
Marin Jankovski e8466a21ca Merge branch 'case_sensitivity' into 'master'
Case Sensitivity for MYSQL

#1014
2014-02-20 12:18:22 +00:00
Dmitriy Zaporozhets 0f080a9410 Make sure note.system is false if created by user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 14:07:42 +02:00
Marin Jankovski fcdcb1a675 Move database setup guide inside the installation. 2014-02-20 12:31:04 +01:00
Marin Jankovski a7a2100f3d Doc syntax highlighting. 2014-02-20 10:51:58 +01:00
Marin Jankovski acdb808abc Update database documentation. 2014-02-20 10:10:25 +01:00
Marin Jankovski c1dddf8c7d Uniqueness check should be case insensitive for username and path, otherwise mysql behaves weird. 2014-02-20 09:45:58 +01:00
Dmitriy Zaporozhets 499a118590 Time for rc1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.6.0.rc1
2014-02-20 10:24:31 +02:00
Dmitriy Zaporozhets dad6b0213c Mention new rails in changelog
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-19 14:49:44 +02:00
Dmitriy Zaporozhets d353e203c8 Merge branch 'link-release-docs' into 'master'
Link Release Docs
2014-02-19 12:44:35 +00:00
Dmitriy Zaporozhets 1b41b7c989 Merge branch 'rails-4-0-3' into 'master'
Rails 4.0.3

Blog post with more information http://weblog.rubyonrails.org/2014/2/18/Rails_3_2_17_4_0_3_and_4_1_0_beta2_have_been_released/
2014-02-19 12:43:41 +00:00
dosire 06fc7e31b5 Refer to release docs. 2014-02-19 13:12:55 +01:00
Dmitriy Zaporozhets 2b8d289130 Fix readme h4 style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-19 13:10:31 +02:00
Dmitriy Zaporozhets 0bd0c8149b More for changelog
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-19 12:06:10 +02:00
Dmitriy Zaporozhets c9befd3d1b Update rails to version 4.0.3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-19 11:55:26 +02:00
Dmitriy Zaporozhets 6a18fd9862 Merge branch 'restyle/issue' into 'master'
Improve UI for Issue#show, MR#show pages
2014-02-19 09:24:52 +00:00
Dmitriy Zaporozhets ededfd2d29 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-19 10:35:24 +02:00
Dmitriy Zaporozhets ee75029867 Move assignee/milestone below description of Issue
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-19 09:38:01 +02:00
Dmitriy Zaporozhets b09610b525 Merge branch 'add-apps' into 'master'
Add Apps
2014-02-18 20:50:01 +00:00
Dmitriy Zaporozhets 83d35399d1 Move MR alert info out of issue-box
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 22:29:12 +02:00
Dmitriy Zaporozhets 88b8b15dbd Improve UI for Issue/MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 22:05:44 +02:00
dosire c0e29f2540 Add apps to readme. 2014-02-18 20:59:34 +01:00
Dmitriy Zaporozhets 7e42084fb8 Move author/date info for Issue#show, MR#show pages to issue-box
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 21:18:46 +02:00
Dmitriy Zaporozhets a718a9af3e Restyle labels filter to match common style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:48:02 +02:00
Dmitriy Zaporozhets 638f8541dc Hide labels filter for MRs and remove unnecessary padding
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:36:03 +02:00
Dmitriy Zaporozhets 25741c97a2 Merge pull request #6350 from tudorpavel/filter-by-multiple-labels
Add feature to filter issues by multiple labels
2014-02-18 20:32:04 +02:00
Dmitriy Zaporozhets 1c61ac1c64 Refactor MR code reload
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:17:26 +02:00
Dmitriy Zaporozhets e1c93a6bca Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-02-18 20:10:00 +02:00
Dmitriy Zaporozhets f0750b9166 Add close button to MR comment form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:09:31 +02:00
Dmitriy Zaporozhets 4eba8036ac Merge branch 'request/branch_compare' into 'master'
Fix for compare button within branches dialog

For the button Compare within the Branches screen ( https://gitlab.com/gitlab-org/gitlab-ce/branches ) beside a branch "foo"

Old behavior:
Will redirect to the compare page that is defaulted to comparison for branch "foo" <--> "foo"

New behavior:
Will redirect and trigger compare page of branch "default" <--> "foo"
Remove of button beside default branch
2014-02-18 15:51:51 +00:00
Dmitriy Zaporozhets 555c25e601 Fix random failing test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 17:34:22 +02:00
Dmitriy Zaporozhets d169ae132b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-02-18 16:52:07 +02:00
Dmitriy Zaporozhets 99966b6069 Merge branch 'namespace-api-doc' into 'master'
Namespace Api Doc
2014-02-18 14:50:13 +00:00
Dmitriy Zaporozhets 0bf4e568ea Use same avatar size for all event rows
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 16:49:50 +02:00
dosire 0007db8352 Doesn't exist for user endpoint. 2014-02-18 15:38:07 +01:00
Dmitriy Zaporozhets ec8628fa95 Merge branch 'feature/mr_context' into 'master'
Allow change assignee/milestone from MergeRequest show page
2014-02-18 14:29:44 +00:00
Dmitriy Zaporozhets 702128892b Allow change assignee/milestone from MergeRequest show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 16:24:27 +02:00
Dmitriy Zaporozhets b05a67f4e3 Split merge request coffee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 16:22:57 +02:00
Dmitriy Zaporozhets 9d637d576c Fix tests 2014-02-18 14:21:13 +00:00
Dmitriy Zaporozhets 8686d09d3e Merge branch 'feature/api_fle_encoded' into 'master'
Complete api files CRUD

Adds ability to read file from repository with content encoded with Base64.
2014-02-18 14:15:40 +00:00
Tudor Pavel 4f6b570fbe Filter issues by multiple labels with Spinach feature spec 2014-02-18 15:38:33 +02:00
Dmitriy Zaporozhets 8a55636f89 Dont replace all issue context when change assignee/milestone
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 13:15:43 +02:00
Dmitriy Zaporozhets 26ebfa20f0 Merge branch 'bug/blob_escaped_json' into 'master'
Fixed bug with json files content being escaped in api

Fixes #1035
2014-02-18 10:46:50 +00:00
Dmitriy Zaporozhets 6cf39fe10d Extract commits API to separate file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 12:41:21 +02:00
Dmitriy Zaporozhets ddbe978041 Complete api files CRUD
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 12:27:02 +02:00
Dmitriy Zaporozhets 3c742dad27 Fixed bug with json files content being escaped in api
After update to recent grape env['api.format'] does not work any more.
Use content_type for rendering raw json files content

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 11:40:45 +02:00
Dmitriy Zaporozhets 87a449f264 Merge pull request #6321 from robertd/update_upgrader_guide
Update upgrader.md ... safety first
2014-02-18 11:29:49 +02:00