home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
karen Carias 70a08acedf fixed conflict 2015-07-16 11:25:12 -07:00
karen Carias 53d40b8ab1 changed some text 2015-07-16 11:18:10 -07:00
Dmitriy Zaporozhets 66bdbdb35d Remove satellites mention from architecture doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 17:57:46 +02:00
Dmitriy Zaporozhets fa88f2c084 Use real branches from test repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 17:09:20 +02:00
Dmitriy Zaporozhets abd2bc00f9 Fix some of tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 17:04:49 +02:00
Dmitriy Zaporozhets 989329c9d9 Fix refresh service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:34:58 +02:00
Dmitriy Zaporozhets 971e47520f Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix reload with full diff link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:32:43 +02:00
Dmitriy Zaporozhets a7fded9b95 Huge refactoring for accepting merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:03:07 +02:00
Sytse Sijbrandij 458053bcb4 Merge branch 'improve-readme' into 'master' 
Document should start from h1 title. Also put badges on top for easier tracking

Looks much better with new project page design. 

See merge request !983
 2015-07-16 12:44:59 +00:00
Dmitriy Zaporozhets c8758357b1 Document should start from h1 title. Also put badges on top for easier tracking 2015-07-16 12:13:09 +00:00
Marin Jankovski 9b6f1c5948 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-16 12:11:25 +02:00
Marin Jankovski f502a83b05 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-07-16 12:11:08 +02:00
karen Carias 4944df86fa added additional space 2015-07-15 16:40:20 -07:00
karen Carias 6096c0296d added note about chef 2015-07-15 11:13:40 -07:00
Dmitriy Zaporozhets 26f5d6047d Refactor compare and fetch logic 2015-07-15 17:28:09 +02:00
Dmitriy Zaporozhets cb6f34e367 Implement update of ref when merge request code is reloaded 2015-07-15 16:52:50 +02:00
Dmitriy Zaporozhets 2a6f522cac Implement merge from forks without satellites 2015-07-15 16:45:50 +02:00
Dmitriy Zaporozhets d9078749a5 Merge branch 'time_ago_fix' into 'master' 
Time ago fix for branch compare page

https://dev.gitlab.org/gitlab/gitlabhq/issues/2508

See merge request !1904
 2015-07-15 14:38:04 +00:00
Dmitriy Zaporozhets 2be3c94925 Fix application initialize 2015-07-15 15:59:38 +02:00
Valery Sizov d2479a25c7 Time ago fix for compare page 2015-07-15 16:59:31 +03:00
Dmitriy Zaporozhets a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Dmitriy Zaporozhets 277f311f20 Fetch reference from fork repo when create merge request 2015-07-15 15:27:14 +02:00
Jacob Vosmaer 82bb5c5e03 Expire Rails cache entries after two weeks 
This should help prevent endless Redis growth.
 2015-07-15 13:53:40 +02:00
Stan Hu bce9315ade Merge pull request #9455 from rburchell/patch-1 
Remove author information from "post" in merge_requests API.
 2015-07-14 23:44:40 -07:00
Stan Hu daed441dfe Merge branch 'merge-request-wip-information' into 'master' 
api: expose work_in_progress flag

See merge request !948
 2015-07-15 01:13:05 +00:00
Kamil Trzciński e62b579793 Merge branch 'docker-image' into 'master' 
Fix docker image

See merge request !979
 2015-07-14 17:48:08 +00:00
Kamil Trzcinski 753f34c8fa Fix docker image 2015-07-14 19:46:55 +02:00
Sytse Sijbrandij 997a3b1d87 Revert password change changelog entry. 2015-07-14 18:02:41 +02:00
Sytse Sijbrandij b3ab0e4efb Revert "Change default admin password from "5iveL!fe" to "password"" 
This reverts commit 8a01a12228.
 2015-07-14 17:59:36 +02:00
Job van der Voort 1da6d42bca Merge branch 'notifications-title' into 'master' 
fixed notifications title

I fixed the title and link to this document because I believe that it's more clear and easier to find if it has "emails" in the name.


See merge request !1897
 2015-07-14 15:24:34 +00:00
Dmitriy Zaporozhets 070d6a2452 Merge branch 'fix-ed' into 'master' 
Fix path to move_drop_indexes.ed

Small documentation fix.

See merge request !1900
 2015-07-14 12:08:26 +00:00
Dmitriy Zaporozhets 67ad6cc7b4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-14 12:56:48 +02:00
Dmitriy Zaporozhets 2280cb23d4 Merge branch 'nice-scroll-sidebar' into 'master' 
Add nice scroll for sidebar

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !978
 2015-07-14 10:48:21 +00:00
Dmitriy Zaporozhets 77216386be Merge branch 'scrollbar-issue' into 'master' 
Hide scrollbar from sidebar when external mouse is connected to OSX

See merge request !977
 2015-07-14 10:47:29 +00:00
Dmitriy Zaporozhets 98cb6256fa Add nice scroll for sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-14 12:29:57 +02:00
Valery Sizov bf3c970be9 Merge branch 'update-guide-713' into 'master' 
create update guides for 7.13



See merge request !1899
 2015-07-14 10:12:54 +00:00
Kamil Trzcinski 2def2cc60a Hide scrollbar from sidebar when external mouse is connected to OSX 2015-07-14 12:02:42 +02:00
Jacob Vosmaer e26e46db2c Fix path to move_drop_indexes.ed 2015-07-14 11:50:01 +02:00
Job van der Voort 80afd4c594 create update guides for 7.13 2015-07-14 11:49:53 +02:00
Dmitriy Zaporozhets c013a9de14 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-14 11:07:07 +02:00
Dmitriy Zaporozhets 87e6786aa0 Merge branch 'rs-fix-coverage' into 'master' 
Move coverage-related setup back to spec_helper

These tools must be loaded before our regular Rails environment.

Partially reverts 57830201a9

See merge request !976
 2015-07-14 09:03:03 +00:00
Dmitriy Zaporozhets 6114aedfe5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-14 10:52:46 +02:00
Dmitriy Zaporozhets ee53ba9f34 Merge branch 'mysql-to-postgres-ed' into 'master' 
Add 'ed' step to mysql-to-postgres procedure

This change brings the documentation in this repo up to date with that in https://github.com/gitlabhq/mysql-postgresql-converter .

See merge request !1896
 2015-07-14 08:52:01 +00:00
Dmitriy Zaporozhets 90e47dd949 Merge branch 'rs-issue-1773' into 'master' 
Fix mentions not being created upon issue/merge request update

New cross-references weren't being added when they were made in an issue or merge request update.

This happened because the relevant `UpdateService`s were making the `notice_added_references` call
after the model had already been updated and saved, so the `changes` attribute was empty and no
cross-references were made at all.

This fixes the bug and adds a bit of testing and a bit of refactoring.

Closes #1773

See merge request !974
 2015-07-14 08:40:08 +00:00
Dmitriy Zaporozhets 5c53dc5a1e Merge branch 'project-default-view' into 'master' 
Allow user to specify content he wants to see on project page

Improvement to !938. Since a lot of people complain on fact they don't like to see README.
Especially since we already have a switcher for dashboard - it kind of acceptable to select behaviour.

User can specify which content he/she wants to see:

![Screenshot_2015-07-13_18.24.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d237474e8f52df4a62ba7e951fa28bd8/Screenshot_2015-07-13_18.24.31.png)

![Screenshot_2015-07-13_18.24.36](https://gitlab.com/gitlab-org/gitlab-ce/uploads/473b0e2a94b3de16d048b8332b539816/Screenshot_2015-07-13_18.24.36.png)

cc @JobV @jacobvosmaer @marin @sytses

See merge request !970
 2015-07-14 08:30:46 +00:00
Robert Speicher ce02bf9900 Move coverage-related setup back to spec_helper 
These tools must be loaded before our regular Rails environment.
 2015-07-13 22:41:47 -04:00
Robert Speicher f3d4767d0c Rename notice_added_references to create_new_cross_references! 2015-07-13 21:31:16 -04:00
Robert Speicher e4c698fd5c Refactor Mentionable#notice_added_references 
It now accounts for models that have changed but have already been
persisted, such as when called from an UpdateService.

Closes #1773
 2015-07-13 21:31:00 -04:00
Dmitriy Zaporozhets 352362adaf Merge branch 'project-plus-icon' into 'master' 
Replaced icon for project page dropdown button

Improve for !971

![Screenshot_2015-07-13_23.37.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2b168c6f8a07f33cab4ca8f735646f8a/Screenshot_2015-07-13_23.37.01.png)

See merge request !973
 2015-07-13 21:53:37 +00:00
Dmitriy Zaporozhets fd84567545 Improve project new item dropdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 23:36:21 +02:00