OSDN Git Service
Dmitriy Zaporozhets [Thu, 12 Sep 2013 18:40:41 +0000 (18:40 +0000)]
Merge branch 'feature/email_when_added_to_group' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 12 Sep 2013 18:39:27 +0000 (21:39 +0300)]
Compare link for branches
Dmitriy Zaporozhets [Thu, 12 Sep 2013 17:28:59 +0000 (17:28 +0000)]
Merge branch 'argument_error_in_gitlab_check' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 12 Sep 2013 17:23:03 +0000 (20:23 +0300)]
Right branches for mr link at Compare view
Dmitriy Zaporozhets [Thu, 12 Sep 2013 17:15:10 +0000 (20:15 +0300)]
Compare page improved
* Show new merge request button from compare page
* Show message if user selected same branches
* Show message if compared branches are the same
* Prepend inputs with from/to labels
Dmitriy Zaporozhets [Thu, 12 Sep 2013 16:00:32 +0000 (19:00 +0300)]
Enable UsersGroup observer, Add group_member methods to NotificationService
Dmitriy Zaporozhets [Thu, 12 Sep 2013 15:59:31 +0000 (18:59 +0300)]
Add UsersGroup observer
Trigger notification service when new user-group relation was created
Dmitriy Zaporozhets [Thu, 12 Sep 2013 14:05:16 +0000 (07:05 -0700)]
Merge pull request #5048 from Nullreff/image-diff
Fix bug with rendering changing images in commits
Dmitriy Zaporozhets [Thu, 12 Sep 2013 14:01:21 +0000 (14:01 +0000)]
Merge branch 'feature/new_landing' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Thu, 12 Sep 2013 13:28:46 +0000 (15:28 +0200)]
Rescue an error if group doesn't exist
Sytse Sijbrandij [Thu, 12 Sep 2013 13:05:27 +0000 (06:05 -0700)]
Merge pull request #5052 from jbornschein/fix-typo
Fix typo in tests
Joerg Bornschein [Thu, 12 Sep 2013 12:30:55 +0000 (14:30 +0200)]
Fix typo in tests
Ryan Mendivil [Wed, 11 Sep 2013 01:36:04 +0000 (17:36 -0800)]
Fix bug with rendering changing images in commits
When viewing the diff for a changed image file, two bugs occur:
- Both the 'before' and 'after' images link to the 'after' commit
- Visiting the link for either image will cause a error
The first is caused by both image links referencing '@commit.id' rather
than '@commit.parent_id'. The second is caused by the use of
'project_tree_path' which is used for creating links to directories in
the git file tree. 'project_blob_path' which links to files should be
used instead.
Dmitriy Zaporozhets [Wed, 11 Sep 2013 19:50:08 +0000 (22:50 +0300)]
Remove commented tests since nobody is going to fix them
Dmitriy Zaporozhets [Wed, 11 Sep 2013 19:46:37 +0000 (22:46 +0300)]
Truncate some text from dashboard events
Dmitriy Zaporozhets [Wed, 11 Sep 2013 19:27:15 +0000 (12:27 -0700)]
Merge pull request #4743 from karlhungus/feature-users-api-respect-defaults
Update User api to respect default settings
Dmitriy Zaporozhets [Wed, 11 Sep 2013 19:20:51 +0000 (22:20 +0300)]
New landing page when you have 0 projects
Izaak Alpert [Wed, 11 Sep 2013 18:03:26 +0000 (14:03 -0400)]
Removed private scope
Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
Dmitriy Zaporozhets [Wed, 11 Sep 2013 18:17:28 +0000 (21:17 +0300)]
Email templates when user was added to group
Dmitriy Zaporozhets [Wed, 11 Sep 2013 18:12:33 +0000 (21:12 +0300)]
Update poltergeist and database_cleaner
Izaak Alpert [Wed, 11 Sep 2013 16:23:04 +0000 (12:23 -0400)]
Style updates
Change-Id: Ib4eb533dff5c722fe559330e4aa71b5d5baf6fb8
Izaak Alpert [Thu, 15 Aug 2013 21:43:46 +0000 (17:43 -0400)]
Update to only provide one way to get a default user
-calling build_user will now apply defaults and only override them if as: :admin is set
Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
Izaak Alpert [Thu, 8 Aug 2013 18:09:33 +0000 (14:09 -0400)]
Update User api to respect default settings
-API now respects default_projects_limit, default_can_create_group, and default_can_create_team
Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
Dmitriy Zaporozhets [Wed, 11 Sep 2013 18:00:16 +0000 (21:00 +0300)]
Fix 404 if Group guest visit empty group page
Dmitriy Zaporozhets [Wed, 11 Sep 2013 17:27:50 +0000 (20:27 +0300)]
Fix feature test
Dmitriy Zaporozhets [Wed, 11 Sep 2013 13:51:59 +0000 (06:51 -0700)]
Merge pull request #5041 from stecman/several-namespaces-fix
Fix user.several_namespaces? to work with multiple ownership of groups
Stephen Holdaway [Wed, 11 Sep 2013 12:10:45 +0000 (00:10 +1200)]
Fix several_namespaces? to work with multiple ownership of groups
Dmitriy Zaporozhets [Wed, 11 Sep 2013 11:19:25 +0000 (04:19 -0700)]
Merge pull request #4942 from aus/patch-2
Add link to project page from admin view
Jacob Vosmaer [Wed, 11 Sep 2013 08:08:38 +0000 (01:08 -0700)]
Merge pull request #5012 from jeffb-bt/master
-i flag allows sudo to work for git users using rvm that is not being us...
Dmitriy Zaporozhets [Tue, 10 Sep 2013 15:21:37 +0000 (08:21 -0700)]
Merge pull request #5022 from amacarthur/config-public-project
make public/private setting for project creation configurable
Angus MacArthur [Tue, 10 Sep 2013 14:49:23 +0000 (10:49 -0400)]
style fixes
Dmitriy Zaporozhets [Tue, 10 Sep 2013 10:43:06 +0000 (13:43 +0300)]
Version up to beta1
Dmitriy Zaporozhets [Tue, 10 Sep 2013 10:42:53 +0000 (13:42 +0300)]
Clear cache when update to 6.1
Dmitriy Zaporozhets [Tue, 10 Sep 2013 10:37:56 +0000 (13:37 +0300)]
More entries in CHANGELOG for 6.1
Dmitriy Zaporozhets [Tue, 10 Sep 2013 10:15:49 +0000 (13:15 +0300)]
UI fixes for commits lists
Dmitriy Zaporozhets [Tue, 10 Sep 2013 07:17:15 +0000 (10:17 +0300)]
Improve commits list UI
Angus MacArthur [Mon, 9 Sep 2013 20:26:27 +0000 (16:26 -0400)]
update to project creation page to reflect default public project setting
Dmitriy Zaporozhets [Mon, 9 Sep 2013 19:20:10 +0000 (12:20 -0700)]
Merge pull request #3525 from karlhungus/api_sudo
API: admin users can sudo commands as other users
Angus MacArthur [Mon, 9 Sep 2013 05:45:30 +0000 (01:45 -0400)]
make public/private setting for project creation configurable
Izaak Alpert [Mon, 9 Sep 2013 17:18:10 +0000 (13:18 -0400)]
Style guide fixes (spacing)
Change-Id: I966bfd0ccc4b05925384ecab8c6cbe3c6ba3b667
Izaak Alpert [Fri, 28 Jun 2013 12:59:05 +0000 (08:59 -0400)]
Some of the requested updates, rebase on master
Change-Id: I305266fe9acbbb5136adeeb52e7e4e1d6629a30a
Izaak Alpert [Thu, 28 Mar 2013 18:37:44 +0000 (14:37 -0400)]
API: admin users can sudo commands as other users
-Specifying a header of SUDO or adding a :sudo with either user id, or username of the user will set the current_user to be that user if your identifying private_token/PRIVATE_TOKEN is an administrator token
Dmitriy Zaporozhets [Mon, 9 Sep 2013 15:44:48 +0000 (15:44 +0000)]
Merge branch 'feature/mr_description' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 9 Sep 2013 14:15:39 +0000 (14:15 +0000)]
Merge branch 'ui/commits_list' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 9 Sep 2013 14:11:58 +0000 (17:11 +0300)]
Improve Merge Request form
* added description
* simplified form
* enabled gfm autocomplete
Dmitriy Zaporozhets [Mon, 9 Sep 2013 13:32:43 +0000 (16:32 +0300)]
Add description to MergeRequest model
Dmitriy Zaporozhets [Mon, 9 Sep 2013 13:20:43 +0000 (16:20 +0300)]
Move commits dates to left
Dmitriy Zaporozhets [Mon, 9 Sep 2013 08:24:59 +0000 (08:24 +0000)]
Merge branch 'refactor-contributing-process' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 9 Sep 2013 08:24:37 +0000 (08:24 +0000)]
Merge branch 'consistent-status' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Sun, 8 Sep 2013 10:31:00 +0000 (12:31 +0200)]
Consistent status.
Dmitriy Zaporozhets [Sun, 8 Sep 2013 08:14:51 +0000 (01:14 -0700)]
Merge pull request #5014 from bladealslayer/feature/big-commit-improvements
Improved large commit handling.
Boyan Tabakov [Wed, 4 Sep 2013 07:33:09 +0000 (10:33 +0300)]
Improved large commit handling.
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.
A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.
Related to #1745, #2259
In addition, handle large commits for MergeRequests and Compare controllers.
Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
Dmitriy Zaporozhets [Sat, 7 Sep 2013 07:23:11 +0000 (00:23 -0700)]
Merge pull request #5013 from clayzermk1/master
Import Bare Repositories instructions/description are incorrect
C. Walker [Fri, 6 Sep 2013 23:45:42 +0000 (16:45 -0700)]
Forgot to fix the comment instructions.
C. Walker [Fri, 6 Sep 2013 23:19:35 +0000 (16:19 -0700)]
Fixed Import Bare Repositories instructions to match rake task.
C. Walker [Fri, 6 Sep 2013 23:18:09 +0000 (16:18 -0700)]
Fixed description.
Jeff '2 bits' Bachtel [Fri, 6 Sep 2013 22:53:10 +0000 (18:53 -0400)]
-i flag allows sudo to work for git users using rvm that is not being used by
root user (su might be better)
Dmitriy Zaporozhets [Thu, 5 Sep 2013 15:03:35 +0000 (08:03 -0700)]
Merge pull request #4990 from karlhungus/feature_group_membership_api
Add group membership api
Izaak Alpert [Thu, 5 Sep 2013 14:17:40 +0000 (10:17 -0400)]
Fixes for @randx
Change-Id: I3b15ae34c0957a0f4026e1886c92a9770e9d170e
Izaak Alpert [Wed, 4 Sep 2013 15:19:03 +0000 (11:19 -0400)]
Add group membership api
Change-Id: I5b174bba02856ede788dcb51ec9b0d598ea7d0df
Dmitriy Zaporozhets [Wed, 4 Sep 2013 15:15:42 +0000 (18:15 +0300)]
Improve commit diff
* show highlights when replace empty line with content
* show inline diff when replace line with spaces with content
Dmitriy Zaporozhets [Wed, 4 Sep 2013 14:05:48 +0000 (17:05 +0300)]
Respect group members in mentionable concern
Dmitriy Zaporozhets [Wed, 4 Sep 2013 13:50:42 +0000 (16:50 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 4 Sep 2013 13:49:03 +0000 (13:49 +0000)]
Merge branch 'refactor/oauth' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 4 Sep 2013 13:20:40 +0000 (16:20 +0300)]
Fix user remove tests. Remove user even if he has projects
Sytse Sijbrandij [Wed, 4 Sep 2013 07:08:39 +0000 (09:08 +0200)]
spelling mistake.
Dmitriy Zaporozhets [Tue, 3 Sep 2013 21:53:13 +0000 (00:53 +0300)]
Rewrite OAuth specs
Dmitriy Zaporozhets [Tue, 3 Sep 2013 21:53:01 +0000 (00:53 +0300)]
Improve Profile#account page
Dmitriy Zaporozhets [Tue, 3 Sep 2013 21:12:00 +0000 (00:12 +0300)]
Refactor Gitlab::Auth
Dmitriy Zaporozhets [Tue, 3 Sep 2013 21:06:29 +0000 (00:06 +0300)]
Use new OAuth classes
Dmitriy Zaporozhets [Tue, 3 Sep 2013 21:06:13 +0000 (00:06 +0300)]
Inherit Gitlab::LDAP::User from Gitlab::OAuth::User
Dmitriy Zaporozhets [Tue, 3 Sep 2013 21:04:27 +0000 (00:04 +0300)]
Added Gitlab::OAuth::User class
Authenticate or create users from OAuth providers
Dmitriy Zaporozhets [Tue, 3 Sep 2013 20:58:42 +0000 (23:58 +0300)]
Dont show remove user button for ldap user
Dmitriy Zaporozhets [Tue, 3 Sep 2013 20:01:58 +0000 (13:01 -0700)]
Merge pull request #4969 from Razer6/update_path_blacklist
Add 'notes' to path blacklist, fixes #4967
Dmitriy Zaporozhets [Tue, 3 Sep 2013 17:55:01 +0000 (20:55 +0300)]
Dont allow html render for RAW view
Dmitriy Zaporozhets [Tue, 3 Sep 2013 17:23:32 +0000 (10:23 -0700)]
Merge pull request #4976 from robertd/master
Update installation docs to use v1.7.1 of gitlab-shell
Robert Djurasaj [Tue, 3 Sep 2013 15:09:12 +0000 (09:09 -0600)]
Update installation docs to use v1.7.1 of gitlab-shell
Jacob Vosmaer [Tue, 3 Sep 2013 12:59:55 +0000 (05:59 -0700)]
Merge pull request #4920 from Rovanion/init-rewrite
Rewrote init script.
Rovanion [Tue, 3 Sep 2013 12:24:20 +0000 (14:24 +0200)]
Made script path flexible
Robert Schilling [Tue, 3 Sep 2013 05:25:39 +0000 (07:25 +0200)]
Add 'notes' to path blacklist, fixes #4967
Dmitriy Zaporozhets [Mon, 2 Sep 2013 21:09:20 +0000 (00:09 +0300)]
Use normal font-weight for file names on tree view
Dmitriy Zaporozhets [Mon, 2 Sep 2013 20:52:58 +0000 (23:52 +0300)]
Remove include of grack_ldap
Dmitriy Zaporozhets [Mon, 2 Sep 2013 20:50:45 +0000 (23:50 +0300)]
Move ldap auth to LDAP::User. Removed unused code
Dmitriy Zaporozhets [Mon, 2 Sep 2013 20:35:40 +0000 (23:35 +0300)]
Mode User+LDAP functionality from Gitlab::Auth
Dmitriy Zaporozhets [Sun, 1 Sep 2013 19:07:02 +0000 (22:07 +0300)]
Color in .rspec
Sytse Sijbrandij [Sun, 1 Sep 2013 10:13:17 +0000 (12:13 +0200)]
Refactor contributing process to make it more readable and make sure other core team members are mentioned.
Dmitriy Zaporozhets [Sat, 31 Aug 2013 22:04:22 +0000 (01:04 +0300)]
Use original raphael-rails v2.1.2
Dmitriy Zaporozhets [Fri, 30 Aug 2013 19:50:06 +0000 (12:50 -0700)]
Merge pull request #4941 from Snooze-/master
Create satellites during update to 6.0. Fix #4938
Dmitriy Zaporozhets [Fri, 30 Aug 2013 19:49:01 +0000 (12:49 -0700)]
Merge pull request #4955 from jojosch/api-help-example-fixes
add missing comma(s) in api examples
Johannes Schleifenbaum [Fri, 30 Aug 2013 19:04:26 +0000 (21:04 +0200)]
add missing comma(s) in api examples
Dmitriy Zaporozhets [Fri, 30 Aug 2013 15:12:07 +0000 (08:12 -0700)]
Merge pull request #4945 from jameswritescode/iid_for_emails
have email views use iid
Dmitriy Zaporozhets [Fri, 30 Aug 2013 14:10:58 +0000 (17:10 +0300)]
Rename team to Project members
James Newton [Fri, 30 Aug 2013 02:26:32 +0000 (21:26 -0500)]
have email views use iid
Rovanion [Thu, 29 Aug 2013 21:26:08 +0000 (23:26 +0200)]
Restart works again, grammar mistakes corrected.
Austin Robertson [Thu, 29 Aug 2013 19:53:22 +0000 (14:53 -0500)]
Add link to project page from admin view
Snooze- [Thu, 29 Aug 2013 19:23:19 +0000 (21:23 +0200)]
Create satellites during update to 6.0. Fix #4938
Satellites for projects that were located in the root namespace needs to be recreated once they've been migrated to the creator’s namespace during the upgrade process.
This can be achieved by running the sudo -u git -H bundle exec rake gitlab:satellites:create RAILS_ENV=production during the update process.
The command has been added to the 5.4 to 6.0 update doc.
Dmitriy Zaporozhets [Thu, 29 Aug 2013 18:49:13 +0000 (21:49 +0300)]
Remove colon
Dmitriy Zaporozhets [Thu, 29 Aug 2013 18:45:19 +0000 (21:45 +0300)]
List groups on Dashboard#projects page
Dmitriy Zaporozhets [Thu, 29 Aug 2013 18:44:45 +0000 (21:44 +0300)]
Dont update namespace if User name was changed. Use user#username for namespace name because Namespace#name validates by uniq
Dmitriy Zaporozhets [Thu, 29 Aug 2013 18:11:01 +0000 (21:11 +0300)]
Minor UI fix