home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,690 Commits 48 Branches 340 Tags
ae44e5ec064aaa9f5063732dc7bb6ee751a80ce2
Commit Graph
17690 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valery Sizov ae44e5ec06 Version 7.13.0.rc2 v7.13.0.rc2 2015-07-15 20:13:47 +03:00
Valery Sizov 6cc81e5f82 Merge branch 'update_stable' into '7-13-stable' 
Time ago fix for compare page



See merge request !1905
 2015-07-15 14:42:51 +00:00
Valery Sizov 5b0d813c09 Time ago fix for compare page 2015-07-15 17:40:59 +03:00
Valery Sizov 159cd36c10 Merge branch '7-13-stable_changelog' into '7-13-stable' 
7-13 stable: changelog update



See merge request !1901
 2015-07-15 09:16:19 +00:00
Valery Sizov 5533a87d56 changelog update 2015-07-15 12:15:32 +03:00
Sytse SijbrandijandValery Sizov fe01cc2fe5 Revert password change changelog entry. 2015-07-15 11:54:24 +03:00
Sytse SijbrandijandValery Sizov f8547fb90f Revert "Change default admin password from "5iveL!fe" to "password"" 
This reverts commit 8a01a12228.
 2015-07-15 11:54:13 +03:00
Valery Sizov b6646e5ba9 Version 7.13.0.rc1 v7.13.0.rc1 2015-07-14 19:00:14 +03: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
Dmitriy Zaporozhets 59d7f4c97f Merge branch 'use_password_field_defaults_for_services' into 'master' 
Use password field defaults for services

Previously we masked the password field manually. After the refactor that services page received we can use `password_field` default masking.

Fixes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/314

See merge request !969
 2015-07-13 18:10:08 +00:00
Dmitriy Zaporozhets 13e987a6de Merge branch 'project-dropdown' into 'master' 
Add dropdown to quickly create issue or branch from project page

because just 'new issue' link is not valid for all users. A lot of people use external issue tracker. So I grouped several links under one button

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

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

cc @JobV @marin @jacobvosmaer @sytses

See merge request !971
 2015-07-13 17:53:27 +00:00
Dmitriy Zaporozhets 4a665e3f5d Merge branch 'scroll-sidebar' into 'master' 
Scroll sidebar

On small screens content of sidebar does not fit. This merge request makes sidebar scrollable which makes it usable for tablets and small laptops.

This merge request has no screenshot because it brings no visual change. Its about action.

cc @darby @JobV

See merge request !972
 2015-07-13 17:51:07 +00:00
karen Carias 3d6e67e44e fixed notifications title 2015-07-13 10:36:29 -07:00
Dmitriy Zaporozhets 24ecc9049f Increase padding between menu items a bit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 19:24:41 +02:00
Dmitriy Zaporozhets a839b2afc4 Make sidebar scrollable. It prevents content overflow for small screens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 19:23:15 +02:00
Dmitriy Zaporozhets 67c17df221 Better wording for project dropdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 19:04:48 +02:00
Dmitriy Zaporozhets 78a94027ea Add dropdown to quickly create issue or branch from project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 18:42:07 +02:00
Dmitriy Zaporozhets 5f34759ecb Allow user to specify content he wants to see on project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 18:24:15 +02:00
Jacob Vosmaer 9ba0079c51 Add 'ed' step to mysql-to-postgres procedure 
Introduced in
https://github.com/gitlabhq/mysql-postgresql-converter/commit/b2d1599706f532e1bac836243f25e005c816ef14
 2015-07-13 18:14:26 +02:00
Achilleas Pipinellis 4fdb3f69ba Merge branch 'revert-relative-doc-link' into 'master' 
Revert "use relative link to SSH setup page"

This broke on GitLab.com.

This reverts commit f876ef6e4d.

See merge request !952
 2015-07-13 15:28:30 +00:00
Marin Jankovski 057d45fb23 Use password field default password masking. 2015-07-13 13:32:14 +02:00
Sytse Sijbrandij 31565d7890 Revert "added link to issue closing pattern in doc" 
This reverts commit 903daedb5a.
 2015-07-13 12:36:53 +02:00
Dmitriy Zaporozhets 4f0455c96b Merge branch 'no-icon-for-back' into 'master' 
Hide icon for bact-to-location menu in sidebar

cc @JobV

![Screenshot_2015-07-13_11.37.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/39d871b6a0e0e555cb497aee865a2f45/Screenshot_2015-07-13_11.37.39.png)

See merge request !968
 2015-07-13 10:29:20 +00:00
Dmitriy Zaporozhets 62da53af33 Hide icon for bact-to-location menu in sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 11:56:08 +02:00
Dmitriy Zaporozhets 00053c805c Merge branch 'ssh-key-linebreaks' into 'master' 
Add error message for SSH key linebreaks

Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/5653544-check-for-linebreaks-in-ssh-key).

See merge request !672
 2015-07-13 09:33:55 +00:00
Dmitriy Zaporozhets 98291295a7 Merge branch 'rs-issue-1908' into 'master' 
Add Safari/iOS and Windows 8 logo information

Now that we've got our 🔥 new logo, let's spread it around a bit more!

Closes #1908

See merge request !944
 2015-07-13 08:54:56 +00:00
Dmitriy Zaporozhets f194fd848b Merge branch 'vis_btn_color_change' into 'master' 
Changed the color of admin/application_settings buttons

Now they look like this: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a43c0c7fada5768bddda6e3449b37a5e/image.png)

gray when selected, white when not.

See merge request !887
 2015-07-13 08:53:38 +00:00
Dmitriy Zaporozhets 171d6fccae Merge branch 'rs-disable-2fa-by-admin' into 'master' 
Allow admins to disable 2FA for a user

> ![Screen_Shot_2015-07-10_at_5.19.13_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3f9bb7c783110d2689c282879cb4b061/Screen_Shot_2015-07-10_at_5.19.13_PM.png)

Depends on !961

See merge request !962
 2015-07-13 08:49:46 +00:00
Dmitriy Zaporozhets d93da8bed5 Merge branch 'rs-disable-2fa' into 'master' 
Add User#disable_two_factor!

This method encapsulates all the logic for disabling 2FA on a specific
User model.

See merge request !961
 2015-07-13 08:47:55 +00:00
Dmitriy Zaporozhets 10d5da784b Merge branch 'fix-api-project-transfer' into 'master' 
Fix transferring of project to another group using the API.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2397.

See merge request !926
 2015-07-13 08:42:42 +00:00