home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +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
Dmitriy Zaporozhets aad3cbeec5 Merge branch 'team-members' into 'master' 
Use same layout and interactivity for project members as group members and make code more consistent.

It's probably easiest to review the commits one by one, but keep in mind that later commits sometimes touch the same place as earlier ones, so look at the complete diff to add comments.

The project members page and group members page now look and work the same, with an inline "Add members" form, member search and editing of access levels and deleting without page refresh.

Before:

![Screen_Shot_2015-03-13_at_16.50.39](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2cd023c48de0a643ce04df965f39e1f5/Screen_Shot_2015-03-13_at_16.50.39.png)

After:

![Screen_Shot_2015-03-13_at_16.50.02](https://dev.gitlab.org/gitlab/gitlabhq/uploads/fdef480daf2859ed74f5641af1f337b3/Screen_Shot_2015-03-13_at_16.50.02.png)

See merge request !1695
 2015-03-16 06:44:53 +00:00
Sytse Sijbrandij a2fb3711f0 Replace linux with GNU/Linux to recognize the work of Dr. Stallman. 2015-03-15 18:06:25 -07:00
Vinnie Okada 8587a29370 Change permissions on backup files 
Use more restrictive permissions for backup tar files and for the db,
uploads, and repositories directories inside the tar files.
 2015-03-15 13:14:30 -06:00
Valery Sizov 9698b36c1c Subscription 2015-03-15 19:44:59 +02:00
Douwe Maan 3b1d5a1dff Prevent gitlab-shell character encoding issues by receiving its changes as raw data. 2015-03-15 16:52:22 +01:00
Douwe Maan 584580e515 Add changelog item. 2015-03-15 13:56:56 +01:00
Douwe Maan e88d06c892 Update button class. 2015-03-15 13:56:32 +01:00
Douwe Maan f66b77e631 Fix failing specs. 2015-03-15 13:55:57 +01:00
Douwe Maan 5ad35bbe02 Use same layout and interactivity for project members as group members. 2015-03-15 13:55:57 +01:00
Douwe Maan 84371de01f Move group leave action from dashboard/groups to groups/group_members. 2015-03-15 13:52:28 +01:00
Douwe Maan 224187ffb9 Move group members index from /members to /group_members. 2015-03-15 13:51:11 +01:00
Douwe Maan 75aff0f79c Move project members index from /team to /project_members 2015-03-15 13:51:11 +01:00
Douwe Maan e97cdb042d Remove old team scopes. 2015-03-15 13:50:38 +01:00
Douwe Maan bbdf23261c Use member instead of tm. 2015-03-15 13:50:38 +01:00
Douwe Maan 31fc73f0a9 Use project_member instead of team_member. 2015-03-15 13:50:38 +01:00
Douwe Maan 99f995755e Use group_member instead of users_group or membership. 2015-03-15 13:49:41 +01:00
Dmitriy Zaporozhets 60df262c38 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-14 16:44:39 -07:00
Dmitriy Zaporozhets aea75cfb0a Merge branch 'fix-mr-notes' into 'master' 
Use pre-wrap for diff code in discussion view

This prevents merge request comments from being hidden in discussion view.  See #2017.

### Before

![diff_comment_before](https://dev.gitlab.org/Okada/gitlabhq/uploads/e6d24987b8d88f4e8a5883645d569b56/diff_comment_before.png)

### After

![diff_comment_after](https://dev.gitlab.org/Okada/gitlabhq/uploads/fc035f9fc44718dc8424d3f8b54f0953/diff_comment_after.png)

This change doesn't affect the "Changes" tab:

![diff_view_comment](https://dev.gitlab.org/Okada/gitlabhq/uploads/9975d4c3feac629d6a0d76b5a0ef43d8/diff_view_comment.png)

cc @sytse

See merge request !1700
 2015-03-14 20:45:50 +00:00
Vinnie Okada d7f357a386 Use pre-wrap for diff code in discussion view 2015-03-14 12:30:36 -06:00
Vinnie Okada ad0ca0499a Merge branch 'master' into fix-restricted-visibility 
Conflicts:
	db/schema.rb
 2015-03-14 10:49:11 -06:00
Vinnie Okada 13e9f4f334 Add tests for snippet services 
Add Rspec tests for the new UpdateSnippetService and
CreateSnippetService classes.
 2015-03-14 10:33:02 -06:00
Vinnie Okada 5710c1aaf8 Update snippet authorization 
Allow authors and admins to update the visibility level of personal and
project snippets.
 2015-03-14 10:30:48 -06:00
Robert Schilling 2b721b2827 Merge pull request #8955 from wasamasa/fix-deploy.sh-typo 
Fix typo
 2015-03-14 10:40:05 +01:00
Vasilij Schneidermann 6235b027ec Fix typo 2015-03-14 10:22:06 +01:00
Dmitriy Zaporozhets 19e0dafbef Merge branch 'more-flatly' 2015-03-14 01:48:13 -07:00
Dmitriy Zaporozhets 9b445c6836 Return some merge widget styles and make it more compact 2015-03-14 01:47:19 -07:00
Dmitriy Zaporozhets 9c7faac040 Merge branch 'resetyle-import' into 'master' 
Restyle import

Render import providers in one line and make it buttons

See merge request !1699
 2015-03-14 08:17:08 +00:00
Dmitriy Zaporozhets 8e1a3fd190 Merge branch 'more-flatly' into 'master' 
More flatly

* use sass variables for repeating colors
* use more of Flatly theme variables
* refactor buttons

See merge request !1698
 2015-03-14 08:16:38 +00:00
Dmitriy Zaporozhets f311e189d5 Improve compare switch button 2015-03-14 00:33:26 -07:00
Dmitriy Zaporozhets 30ca451fd4 Refactor buttons 2015-03-14 00:29:32 -07:00
Dmitriy Zaporozhets abf90611cb Improve import buttons on new project page 2015-03-14 00:13:15 -07:00
Dmitriy Zaporozhets dffa2fa9e9 Use sass variabled for backgroung and border colors 2015-03-13 23:40:46 -07:00
Dmitriy Zaporozhets 2da2720584 Improve css for file actions 2015-03-13 19:20:25 -07:00
Marin Jankovski 89d3028b20 Update monthly doc to mention wip blogpost for next release. 2015-03-13 19:00:16 -07:00
Marin Jankovski e8dbd692f6 Remove rubyracer 2015-03-13 18:22:26 -07:00
Marin Jankovski 3aded9d581 Update changelog with change to unicorn workers number recommendation. 2015-03-13 17:47:30 -07:00
Marin Jankovski 8c2655b5bf Remove rubyracer gem. 2015-03-13 17:44:54 -07:00
Marin Jankovski 06439fd784 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-13 17:16:28 -07:00
Marin Jankovski 2d3a0f6d63 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-13 17:14:52 -07:00
Marin Jankovski 141168ad3c Change default number of unicorn workers to three. 2015-03-13 17:14:34 -07:00
Dmitriy Zaporozhets afb694886e Merge branch 'ldap-unblock-user' into 'master' 
Unblock user if they were unblocked in AD.

Fixes problem with !1687.

See merge request !1694
 2015-03-13 22:25:47 +00:00
Robert Schilling 42be733d41 Merge pull request #8954 from pupaxxo/patch-2 
Fix typo in CHANGELOG.md
 2015-03-13 22:40:16 +01:00
Douwe Maan 8fed435208 Unblock user if they were unblocked in AD. 2015-03-13 22:34:11 +01:00
Douwe Maan 42e97d2891 Merge branch 'fix_tests' into 'master' 
Fix failing tests

Revert the last merge, as it breaks the master and I didn't see that this line is used in hooks as well when I merged this.

See merge request !390
 2015-03-13 21:22:13 +00:00
Hannes Rosenögger 2172d7ff9e Revert "Merge branch 'follow-on-mr376' into 'master'" 
This reverts commit 07f9a3f928, reversing
changes made to 4803675190.

Reverted this because the data is used in hooks as well.
 2015-03-13 22:17:51 +01:00
Andrea Ruggiero a1b3e239ee Fix typo in CHANGELOG.md 2015-03-13 21:27:05 +01:00
Hannes Rosenögger 07f9a3f928 Merge branch 'follow-on-mr376' into 'master' 
Follow on to MR 376

Follow-on to MR 376 from @haynes . Remove unnecessary fetch of commit messages for initial push. This will reduce the memory usage significantly.

See merge request !387
 2015-03-13 19:16:42 +00:00
Dmitriy Zaporozhets 4803675190 Merge branch 'bump-gitlab-git' into 'master' 
Bump gitlab_git to 7.1.1

Verify found object is actually a commit in Commit.find.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1204

See merge request !1696
 2015-03-13 17:34:44 +00:00
Dmitriy Zaporozhets 309f588d56 Merge branch 'fix-encoding' into 'master' 
Minor cleanup around UTF-8 encoding.

Minor cleanup to be merged after https://dev.gitlab.org/gitlab/gitlab_git/merge_requests/24 is merged in.

See merge request !1642
 2015-03-13 16:50:53 +00:00
Dmitriy Zaporozhets b09e8c771c Bump gitlab_git to 7.1.1 
Verify found object is actually a commit in Commit.find
 2015-03-13 09:47:50 -07:00