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
12,501 Commits 48 Branches 340 Tags
f0dd16d53e81bb0796fa6fa422efcab8a64f097a
Commit Graph
12501 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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
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
Ben Bodenmiller 87fa3f0d2e ruby -> Ruby 2014-10-29 21:18:57 -07:00
Ben Bodenmiller 1f62cb3ee7 fix git installation 2014-10-29 19:09:24 -07:00
Sytse Sijbrandij bd0d679b23 Update patch manual to link to blog post. 2014-10-29 16:24:07 -07:00
Dmitriy Zaporozhets 905004fdc3 Merge pull request #7980 from mr-vinn/diff-renames 
Display renamed files in diff views
 2014-10-29 19:09:33 +02:00
Dmitriy Zaporozhets 9cadfc9e13 Update omniauth-ldap & dependencies 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 17:17:22 +02:00
Valery Sizov ed9350dc57 Merge branch 'fix-buildbox-integration' into 'master' 
Fix buildbox integration

Fixes gitlab/gitlabhq#1725

See merge request !1229
 2014-10-29 14:47:36 +00:00
Dmitriy Zaporozhets ec5482a0dc Explicitly require addressable gem feature you need. Fixes Buildbox CI integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:34:28 +02:00
Valery Sizov 4e321ec11c Merge branch 'improve-group-members-api' into 'master' 
Improve group members api

Related #1720

See merge request !1225
 2014-10-29 13:42:56 +00:00
Dmitriy Zaporozhets a565c51b86 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-29 13:41:29 +02:00
Dmitriy Zaporozhets 93bed4435e Merge pull request #8060 from dblessing/feature/bamboo_service 
Add Atlassian Bamboo service
 2014-10-29 13:41:13 +02:00
Dmitriy Zaporozhets eea6a8a17d Dont allow guests..developers to manage group members 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 13:38:00 +02:00
Dmitriy Zaporozhets f6491508fe Split group members api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 13:31:23 +02:00
Jacob Vosmaer 527bbd44de Merge branch 'master' into 'master' 
Close #717

This closes #717:

Add documentation changes to:

 * Set the permissions of the unix socket properly
 * Create the directory for the socket
 * Make sure tmpfiles.d persists said directory

The first change makes sure gitlabl can connect to the socket. The latter two avoid redis from failing to start on systemd-based systems, including recent versions of Debian.

You may probably want to cherry-pick this into the documentation for the latest stable release.

See merge request !224
 2014-10-29 11:01:18 +00:00
Robert Schilling 7c00a841f5 Merge pull request #8187 from bbodenmiller/patch-4 
minor requirements.md cleanup
 2014-10-28 23:04:40 +01:00
Dmitriy Zaporozhets d6db6dda75 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-28 20:02:40 +02:00
Dmitriy Zaporozhets fa39863611 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-28 20:02:01 +02:00
Patricio Cano d9023da90d Refactored password_strength configuration 2014-10-28 12:48:20 -05:00
Ben Bodenmiller dc4caa26bf minor requirements.md cleanup 
* "Non Unix"->"Non-Unix"
* Fix poor wording
 2014-10-28 09:47:57 -07:00
Patricio Cano bf07fcf06a Removed unnecessary role in form. 2014-10-28 11:04:46 -05:00
Patricio Cano 9397d19380 Added ID to the form-group, to fix alignment of inputs 2014-10-28 11:02:36 -05:00
Dmitriy Zaporozhets 1ad78be981 Merge branch 'transfer-service-spec-cleanups' into 'master' 
Transfer service spec cleanups

Simplify the current tests for Projects::TransferService

See merge request !208
 2014-10-28 14:19:27 +00:00
Dmitriy Zaporozhets c71792d98c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-28 16:15:31 +02:00
Dmitriy Zaporozhets d0ebdedf98 Merge branch 'mr-vinn/gitlab-ce-api-project-delete' 2014-10-28 16:14:46 +02:00
Dmitriy Zaporozhets 576a80e97c Merge branch 'api-project-delete' of https://gitlab.com/mr-vinn/gitlab-ce into mr-vinn/gitlab-ce-api-project-delete 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/projects_spec.rb
 2014-10-28 16:14:40 +02:00
Dmitriy Zaporozhets f3c120d25a Add failing test that should be green after group members api get fixed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-28 16:00:03 +02:00
Dmitriy Zaporozhets 9306d8fca2 Merge branch 'dashboard_issues_and_mr' into 'master' 
Dashboard issues and merge request filters

Fixes #1597

See merge request !1219
 2014-10-28 13:38:41 +00:00
Dmitriy Zaporozhets eaebc20eba Merge branch 'disable_email_option' into 'master' 
Disable email option

Fixes #1569

See merge request !1222
 2014-10-28 13:36:28 +00:00
Dmitriy Zaporozhets 2a16bbd626 Merge pull request #7572 from mr-vinn/application-js-fix 
Handle undefined text area values
 2014-10-28 15:23:45 +02:00
Dmitriy Zaporozhets ec4a079099 Merge pull request #7976 from bbodenmiller/patch-9 
support latest firefox esr release
 2014-10-28 14:07:42 +02:00
Drew Blessing 776bca07cd Add Atlassian Bamboo service 2014-10-28 05:20:36 -05:00
Dmitriy Zaporozhets b23b78ada1 Merge pull request #7866 from cirosantilli/input-button-to-tag 
Use button type=submit instead of input.
 2014-10-28 12:11:15 +02:00
Dmitriy Zaporozhets beabf5db8c Merge pull request #8091 from cirosantilli/factor-ability-abilities 
Factor abilities methods
 2014-10-28 12:09:55 +02:00
Dmitriy Zaporozhets 26175e4459 Merge pull request #8127 from cirosantilli/user-select-js-only-needed 
Run user select Js only where needed
 2014-10-28 12:08:57 +02:00
Marin Jankovski 50ee0b81b8 Leave the project name field editable, fix the test. 2014-10-28 09:19:58 +01:00
Ben Bodenmiller 6093d4fd83 fix markdown formatting 
fix markdown formatting issue
 2014-10-27 23:28:02 -07:00
Sytse Sijbrandij 45d9446978 Merge pull request #8178 from dblessing/backport/update-doc 
Change update recommendation
 2014-10-27 11:27:05 -07:00