home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schilling 1b1403804e Merge pull request #8223 from cirosantilli/slack-require-spec-helper 
Use require spec_helper instead of relative path
 2014-11-02 10:09:29 +01:00
Robert Schilling 4d23e840d3 Merge pull request #8209 from naveda89/patch-1 
Fixed markdown error in 7.3-to-7.4 update guide
 2014-11-02 10:08:03 +01:00
Ciro Santilli ffa586061d Use require spec_helper instead of relative path 
More portable if either test or class gets moved,
more uniform with the rest of the tests.
 2014-11-01 22:30:46 +01:00
Ciro Santilli 54ded5d95b Continue strings with backslash instead of append 2014-11-01 22:26:12 +01:00
Robert Schilling e9171fea85 Merge pull request #8217 from bbodenmiller/change-label-generation 
remove feature label
 2014-11-01 10:38:25 +01:00
Ben Bodenmiller 3e55d56c90 remove feature label 
For automatic label generation remove label `feature` as it is basically means the same thing as label `enhancement`.
 2014-10-31 17:22:16 -07:00
Robert Schilling dae7b941f6 Merge pull request #8213 from cirosantilli/factor-backend-shell-path 
Factor lib backend gitlab shell path
 2014-10-31 13:40:31 +01:00
Robert Schilling 394646670b Merge pull request #8211 from cirosantilli/rake-import-style 
Fix doc rake import md style [ci-skip]
 2014-10-31 13:38:54 +01:00
Ciro Santilli d549a2a525 Factor lib backend gitlab shell path 2014-10-31 13:00:50 +01:00
Ciro Santilli 884e916fe2 Fix doc rake import md style [ci-skip] 2014-10-31 12:51:53 +01:00
Alvaro Naveda 76e3b8c659 Fixed markdown error in 7.3-to-7.4 update guide 
Just fixed a minor bug in the markdown notation
 2014-10-31 11:55:56 +01:00
Dmitriy Zaporozhets 7371c9e2f4 Merge branch 'better-service-migration' into 'master' 
Better service migration

Prevent crashes and saving invalid record. Skip non-valid services.

Better fix for https://github.com/gitlabhq/gitlabhq/pull/8199

See merge request !1235
 2014-10-31 10:16:42 +00:00
Dmitriy Zaporozhets 9b251bd1cc Update changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-31 12:10:19 +02:00
Dmitriy Zaporozhets ef9f8677e6 Expose author username in project events API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-31 12:08:45 +02:00
Dmitriy Zaporozhets 80059cb523 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-31 11:39:17 +02:00
Dmitriy Zaporozhets aa75a755ee Merge branch 'api-delete-branch-json' into 'master' 
Api delete branch json

Fixes gitlab/gitlabhq#1478

See merge request !1233
 2014-10-31 09:38:24 +00:00
Dmitriy Zaporozhets 1bfba5df22 Merge pull request #8205 from CromFr/master 
Doc: Unicorn minimum worker_processes is 2
 2014-10-31 11:26:42 +02: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
Sytse Sijbrandij 5a699090cd Merge branch 'improve_rake_import_doc' into 'master' 
Improve import Documentation

Improved the documentation steps for importing bare git repositories to GitLab.

@dzaporozhets I added a step to create gitlab-satellites. Is this step really necessary, or do the satellites get created as needed?

See merge request !1234
 2014-10-30 22:51:41 +00:00
Crom (Thibaut CHARLES) 3c9bf8a322 Doc: Unicorn minimum worker_processes is 2 
A value of 1 cause http push fail (issue #6978 on GitHub)
 2014-10-30 23:41:45 +01:00
Patricio Cano 2022754d93 Modified according to suggestions by @sytse 2014-10-30 17:36:25 -05:00
Sytse Sijbrandij a1dda564b1 Revert "Change update recommendation" since it should be fixed with 
c3104abfd4

This reverts commit 8101640c33.
 2014-10-30 14:59:05 -07:00
Sytse Sijbrandij ed478105bd Merge pull request #8199 from dblessing/fix/serialize_migration 
Fix serialize migration
 2014-10-30 14:58:22 -07:00
Patricio Cano 5c645b76b3 Fixed typo 2014-10-30 13:14:31 -05:00
Patricio Cano 792f7e09e2 Corrected layout, to be more friendly. 2014-10-30 13:10:07 -05:00
Patricio Cano 493d3e8240 Corrected the wording of the documentation and the layout. 2014-10-30 13:08:10 -05:00
Patricio Cano 19caccf773 Added the satellites:create step, that might be necessary after the import. 
Corrected syntax.
 2014-10-30 12:38:09 -05:00
Andrey KrivkoandDmitriy Zaporozhets bafd30f92c Session API: Use case-insensitive authentication like in UI 2014-10-30 18:29:18 +02:00
Dmitriy Zaporozhets 20e04d9f39 Delete branch via API: doc updated 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-30 17:30:09 +02:00
Dmitriy Zaporozhets 961a6bfcc2 API delete branch: render branch name json instead of true 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-30 17:28:59 +02:00
Dmitriy Zaporozhets 59c25eb215 Merge pull request #8122 from bbodenmiller/cleanup-time-zone 
cleanup time zone settings
 2014-10-30 16:46:36 +02:00
Dmitriy Zaporozhets 85a9feabd6 Merge branch '7-4-stable' of github.com:gitlabhq/gitlabhq into 7-4-stable 2014-10-30 16:40:34 +02:00
Dmitriy Zaporozhets 8431db3326 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-30 16:17:48 +02:00
Dmitriy Zaporozhets f0dd16d53e Merge branch 'master' of github.com:gitlabhq/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-10-30 16:17:36 +02:00
Dmitriy Zaporozhets c2f0ae8a40 Merge pull request #7850 from asedge/api_add_tag_message 
Finish up work on annotated tags
 2014-10-30 16:16:01 +02:00
Sean Edge 822d9aa6ba Create RepoTag Grape entity and present it when doing stuff with tags via API. Update API doc for repositories. Add tag message to tag list page in UI. Update Changelog. Update spec to set .gitconfig identity, required for annotated tags. 2014-10-30 09:48:23 -04:00
Jacob Vosmaer 8146271d40 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup_restore_drop_sequences 
Conflicts:
	CHANGELOG
 2014-10-30 14:41:16 +01:00
Dmitriy Zaporozhets 8388bbe829 Merge branch 'notify-on-mention-everywhere' into 'master' 
Notify on mention everywhere

Fixes gitlab/gitlabhq#1558

See merge request !1228
 2014-10-30 13:23:16 +00:00
Dmitriy Zaporozhets 353a987578 Add addressable explicitly to Gemfile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v7.4.3 		2014-10-30 14:45:15 +02:00
Dmitriy Zaporozhets 6cb5d3d2d4 Add addressable explicitly to Gemfile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-30 14:44:46 +02:00
Dmitriy Zaporozhets e1299bab7b Merge branch 'feature_password_strength_indicator' into 'master' 
Add a password strength indicator to SIGN UP and PROFILE pages

Fixes #1647

Added a password strength indicator to the sign up page. You can see how it looks in the following screenshot. In the sign up page, it checks if the password contains the username and alerts the user about it. If the user still wants to proceed with creating his account, nothing will stop him. This is merely a message. The indicator changes the input background color based on the strength like this:

![new_full](https://dev.gitlab.org/uploads/gitlab/gitlabhq/0e6da27cfe/new_full.png)

The password strength indicator can also be found in the profile edit page. It functions in almost the exact same way, with the exception that it doesn't check if the password contains the username.

![edit_full](https://dev.gitlab.org/uploads/gitlab/gitlabhq/f73001539e/edit_full.png)

There are tests included.

/cc @job

See merge request !1227
 2014-10-30 11:32:11 +00:00
Valery Sizov fa96b0517f Merge branch 'patch-release-tweet' into 'master' 
Patch release tweet

This tweet is not very informative: https://twitter.com/gitlabhq/status/525728773812289536

@valery  Can you please ensure the tweet includes the most important feature that the release is addressing?

I also updated the manual to link to the blog post.

See merge request !1231
 2014-10-30 11:28:20 +00:00
Dmitriy Zaporozhets dade6650e1 Add CHANGELOG entry 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-30 13:27:06 +02:00
Dmitriy Zaporozhets fd17ba9ffc Mentioned users are not limited by project scope any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-30 13:26:45 +02:00
Dmitriy Zaporozhets 408bbb1bc6 Merge branch 'bump-ldap-lib' into 'master' 
Bump net-ldap lib

Fixes #1700

See merge request !1230
 2014-10-30 11:20:31 +00:00
Dmitriy Zaporozhets ff6b352610 Merge branch 'project_name_and_path_rename' into 'master' 
Project name and path rename in the same section

Fixes #1577

See merge request !1223
 2014-10-30 11:19:33 +00:00
Drew Blessing c3104abfd4 Fix serialize migration 2014-10-30 05:01:21 -05:00
Robert Schilling f99b876837 Merge pull request #8185 from bbodenmiller/patch-3 
fix markdown formatting
 2014-10-30 08:53:37 +01:00
Robert Schilling b8d85bc230 Merge pull request #8194 from bbodenmiller/patch-9 
ruby -> Ruby
 2014-10-30 08:51:39 +01:00
Robert Schilling a2e46cf12f Merge pull request #8191 from bbodenmiller/patch-4 
fix git installation
 2014-10-30 08:48:50 +01:00