OSDN Git Service
Dmitriy Zaporozhets [Tue, 3 Sep 2013 20:58:42 +0000 (23:58 +0300)]
Dont show remove user button for ldap user
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
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
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
Dmitriy Zaporozhets [Thu, 29 Aug 2013 17:55:37 +0000 (17:55 +0000)]
Merge branch 'feature/reset_event_cache' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 29 Aug 2013 17:33:57 +0000 (20:33 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 29 Aug 2013 17:32:40 +0000 (20:32 +0300)]
Update sidekiq and redis-rails
Dmitriy Zaporozhets [Thu, 29 Aug 2013 17:02:32 +0000 (10:02 -0700)]
Merge pull request #4906 from alexvh/standardize_diff_api_url
Standardize recently added commit diff api url
Dmitriy Zaporozhets [Thu, 29 Aug 2013 16:56:34 +0000 (09:56 -0700)]
Merge pull request #4939 from fintler/key_gen_help_typo
Fixed up wording on the new SSH key page.
Dmitriy Zaporozhets [Thu, 29 Aug 2013 16:56:16 +0000 (09:56 -0700)]
Merge pull request #4924 from jameswritescode/update_check_to_verify_update_hook
update gitlab:check to look for update hook, not post-receive
Jon Bringhurst [Thu, 29 Aug 2013 16:34:37 +0000 (10:34 -0600)]
Fixed up wording on the new SSH key page.
Dmitriy Zaporozhets [Thu, 29 Aug 2013 16:12:22 +0000 (19:12 +0300)]
Invalidate events cache when project was moved
Dmitriy Zaporozhets [Thu, 29 Aug 2013 15:59:08 +0000 (18:59 +0300)]
More entries to 6.1 CHANGELOG
Dmitriy Zaporozhets [Wed, 28 Aug 2013 18:36:09 +0000 (21:36 +0300)]
Fix s500 when press ervice test button
Alex Van't Hof [Wed, 28 Aug 2013 01:22:42 +0000 (21:22 -0400)]
Standardize commit diff api url, change blob api url, add get single commit
Use "/commits/:sha/diff" as opposed to "/commit/:sha", keeping in line
with existing api urls (e.g. "/projects/:id", etc.)
Fix 500 error resulting from a diff api call with an invalid commit hash
Move "/commits/:sha/blob" to "/blobs/:sha", leaving the old path for
backwards compatibility.
Add ability to get a single commit via "/commits/:sha"
James Newton [Tue, 27 Aug 2013 21:15:32 +0000 (16:15 -0500)]
update gitlab:check to look for update hook, not post-receive
Dmitriy Zaporozhets [Tue, 27 Aug 2013 21:04:04 +0000 (00:04 +0300)]
fix tests
Dmitriy Zaporozhets [Tue, 27 Aug 2013 19:46:35 +0000 (19:46 +0000)]
Merge branch 'improve/user_removal' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 27 Aug 2013 19:03:21 +0000 (19:03 +0000)]
Merge branch 'warning-about-project-issue-numbers' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 27 Aug 2013 19:00:41 +0000 (22:00 +0300)]
Remove old specs
Dmitriy Zaporozhets [Tue, 27 Aug 2013 18:35:41 +0000 (21:35 +0300)]
Improve admin user show page
Show permissions for all project.
Add ability to remove user from group if not an owner
Remove unnecessary admin controller
Dmitriy Zaporozhets [Tue, 27 Aug 2013 17:40:42 +0000 (20:40 +0300)]
Improve user block/removal from admin area
Provide UI with explanation what happens when you block or remove user
When remove user - remove all groups where user is an only owner
Dmitriy Zaporozhets [Tue, 27 Aug 2013 10:44:58 +0000 (13:44 +0300)]
Add description to user removal block. Transfer owned groups to admin before remove
Dmitriy Zaporozhets [Tue, 27 Aug 2013 10:56:04 +0000 (13:56 +0300)]
Services and hooks MUST BE executed on branch push!
Dmitriy Zaporozhets [Tue, 27 Aug 2013 10:49:29 +0000 (13:49 +0300)]
Few fixes to spinach tests
Dmitriy Zaporozhets [Tue, 27 Aug 2013 10:20:36 +0000 (13:20 +0300)]
Add links to create branch/tag from project home page
Dmitriy Zaporozhets [Tue, 27 Aug 2013 10:14:55 +0000 (13:14 +0300)]
Fix spinach tests
Dmitriy Zaporozhets [Tue, 27 Aug 2013 10:11:05 +0000 (13:11 +0300)]
Minor UI improvements
Dmitriy Zaporozhets [Tue, 27 Aug 2013 09:59:44 +0000 (12:59 +0300)]
Remove team mentions
Dmitriy Zaporozhets [Tue, 27 Aug 2013 09:47:28 +0000 (12:47 +0300)]
If user is owner of project it cant be removed from this project
Dmitriy Zaporozhets [Tue, 27 Aug 2013 09:41:49 +0000 (12:41 +0300)]
Return empty abilities if user is blocked
Dmitriy Zaporozhets [Tue, 27 Aug 2013 09:34:54 +0000 (12:34 +0300)]
Show amount of users and projects in Profile#groups
Dmitriy Zaporozhets [Tue, 27 Aug 2013 09:18:53 +0000 (12:18 +0300)]
Use flash message for notification across app
Dmitriy Zaporozhets [Tue, 27 Aug 2013 09:03:41 +0000 (12:03 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 27 Aug 2013 09:01:45 +0000 (12:01 +0300)]
Improve user block logic
When block user - remove it from joined groups
Dont remove user from own resources (groups, users)
Dmitriy Zaporozhets [Tue, 27 Aug 2013 08:21:57 +0000 (01:21 -0700)]
Merge pull request #4916 from marbindrakon/merge_request_api
Fix project_id field in MergeRequest API
Andrew Austin [Tue, 27 Aug 2013 01:54:09 +0000 (01:54 +0000)]
Fix project_id field in MergeRequest API
Sytse Sijbrandij [Mon, 26 Aug 2013 18:59:15 +0000 (20:59 +0200)]
Warning about issue numbers.
Dmitriy Zaporozhets [Mon, 26 Aug 2013 18:13:54 +0000 (21:13 +0300)]
Set correct header border-bottom color for themes
Dmitriy Zaporozhets [Mon, 26 Aug 2013 17:58:34 +0000 (20:58 +0300)]
Fix mailer tests
Dmitriy Zaporozhets [Mon, 26 Aug 2013 15:27:19 +0000 (08:27 -0700)]
Merge pull request #4904 from axilleas/master
Clear redis cache and precompile assets during update to 6.0. Fix #4874 #4840
Axilleas Pipinellis [Mon, 26 Aug 2013 07:09:53 +0000 (10:09 +0300)]
Clear redis cache and precompile assets during update to 6.0. Fix #4874 #4840
As a consequence on the namespaces change from 5.4 to 6.0, after upgrade
lots of links on the dashboard were not working (pointing to projects
without the group part on the url).
Also, after upgrading to 6.0-stable, the network (branch history) function
does not work. The progress bar rotates forever, but the network graph cannot
be generated.
Clearing redis cache fixes those issues.
Dmitriy Zaporozhets [Mon, 26 Aug 2013 13:46:03 +0000 (16:46 +0300)]
Add br for new sentense in Compare view
Dmitriy Zaporozhets [Mon, 26 Aug 2013 13:32:15 +0000 (06:32 -0700)]
Merge pull request #4897 from rtripault/iids
[#4821] - Fix some missing iids
Dmitriy Zaporozhets [Mon, 26 Aug 2013 13:30:03 +0000 (16:30 +0300)]
Add event filter for group and project show pages
Romain [Mon, 26 Aug 2013 12:54:07 +0000 (14:54 +0200)]
[#4821] - Fix some missing iids
Dmitriy Zaporozhets [Mon, 26 Aug 2013 12:49:11 +0000 (15:49 +0300)]
Remove bottom margin for text in event note
Dmitriy Zaporozhets [Mon, 26 Aug 2013 12:09:33 +0000 (15:09 +0300)]
Fix md help table header
Dmitriy Zaporozhets [Mon, 26 Aug 2013 12:07:07 +0000 (15:07 +0300)]
Add test and docs for markdown tables
Dmitriy Zaporozhets [Mon, 26 Aug 2013 11:53:36 +0000 (14:53 +0300)]
Remove old migration tasks
You should update to 6.0 before proceed with update to higher version.
So its no reason to keep old tasks any more.
It should be still available in 6-0-stable but not in master
Dmitriy Zaporozhets [Mon, 26 Aug 2013 11:27:19 +0000 (14:27 +0300)]
Allow markdown tables
Dmitriy Zaporozhets [Mon, 26 Aug 2013 11:15:21 +0000 (14:15 +0300)]
Add redirect from Issue#id to Issue#iid
Dmitriy Zaporozhets [Mon, 26 Aug 2013 11:02:09 +0000 (04:02 -0700)]
Merge pull request #4892 from Aigeruth/feature/api-add-diff
Feature: get the diff of a commit via API.
Dmitriy Zaporozhets [Mon, 26 Aug 2013 10:50:13 +0000 (13:50 +0300)]
Better style for blockquote text in comments
Dmitriy Zaporozhets [Mon, 26 Aug 2013 10:38:27 +0000 (10:38 +0000)]
Merge branch 'userfriendly-compare-page' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 26 Aug 2013 10:37:58 +0000 (10:37 +0000)]
Add placeholders from and to
Dmitriy Zaporozhets [Mon, 26 Aug 2013 10:20:45 +0000 (13:20 +0300)]
Set iid in fixtures. Add rake dev:setup for development
Dmitriy Zaporozhets [Mon, 26 Aug 2013 10:06:41 +0000 (13:06 +0300)]
Mars theme for generated admin account
Dmitriy Zaporozhets [Mon, 26 Aug 2013 09:54:57 +0000 (12:54 +0300)]
Fix issue when developers are able to push to protected branch
When that branch contain a '/' in the branch name.
Fix for git over HTTP
Dmitriy Zaporozhets [Mon, 26 Aug 2013 09:31:57 +0000 (02:31 -0700)]
Merge pull request #4507 from smashwilson/linking-issues
Linking objects from GFM references
ash wilson [Thu, 30 May 2013 23:16:49 +0000 (23:16 +0000)]
Link issues from comments and automatically close them
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
Gabor Nagy [Sun, 25 Aug 2013 21:21:00 +0000 (23:21 +0200)]
Adds feature: get a diff via API.
Dmitriy Zaporozhets [Sun, 25 Aug 2013 19:22:04 +0000 (12:22 -0700)]
Merge pull request #4815 from MegaDiablo/patch-1
add link on realisation api for java client
Dmitriy Zaporozhets [Sun, 25 Aug 2013 19:21:22 +0000 (12:21 -0700)]
Merge pull request #4841 from Razer6/update_path_blacklist
Add 'hooks' to path blacklist.
Dmitriy Zaporozhets [Sun, 25 Aug 2013 19:21:11 +0000 (12:21 -0700)]
Merge pull request #4845 from mmoll/unicorn_localhost
bind unicorn listener to 127.0.0.1
Dmitriy Zaporozhets [Sun, 25 Aug 2013 19:20:26 +0000 (12:20 -0700)]
Merge pull request #4854 from aus/patch-1
Fix GitLab Shell version check
Dmitriy Zaporozhets [Sun, 25 Aug 2013 19:13:53 +0000 (12:13 -0700)]
Merge pull request #4879 from sugarmo/master
Select files with diff filter for graph log
Dmitriy Zaporozhets [Sun, 25 Aug 2013 18:49:06 +0000 (11:49 -0700)]
Merge pull request #4860 from gitlabhq/fix_service_gitlab_restart
Fix the `service gitlab restart` command
dsekretov [Fri, 23 Aug 2013 09:34:08 +0000 (13:34 +0400)]
Update 20130419190306_allow_merges_for_forks.rb
Postgress db migrate fails.(5.4=>6.0)
Dmitriy Zaporozhets [Sat, 24 Aug 2013 19:43:35 +0000 (22:43 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sat, 24 Aug 2013 19:42:52 +0000 (22:42 +0300)]
Fixed 500 error when try to remove group
Steven Mok [Sat, 24 Aug 2013 03:27:08 +0000 (11:27 +0800)]
Select files with diff filter for graph log
Sytse Sijbrandij [Fri, 23 Aug 2013 13:52:49 +0000 (15:52 +0200)]
People like Karen and myself are confused by the placeholder, it seems like you don't have to change the master value. Also the to and from should be more prominent.
Jacob Vosmaer [Fri, 23 Aug 2013 08:28:07 +0000 (10:28 +0200)]
Fix the `service gitlab restart` command
This commit addresses two related issues:
- Sidekiq should shut down completely before we restart it;
- If we restart unicorn with USR2 we need to kill the old master and
worker processes.
Austin Robertson [Thu, 22 Aug 2013 18:10:18 +0000 (13:10 -0500)]
Fix GitLab Shell version check
Jacob Vosmaer [Thu, 22 Aug 2013 14:04:10 +0000 (07:04 -0700)]
Merge pull request #4847 from Stayallive/patch-1
Added assets:precompile in upgrade guide 5.4 -> 6.0
Alex Bouma [Thu, 22 Aug 2013 14:00:42 +0000 (16:00 +0200)]
Added assets:precompile in upgrade guide 5.4 -> 6.0
Dmitriy Zaporozhets [Thu, 22 Aug 2013 12:45:36 +0000 (15:45 +0300)]
Show reopen milestone button if milestone was closed
Dmitriy Zaporozhets [Thu, 22 Aug 2013 12:40:48 +0000 (15:40 +0300)]
Show iids for issues/mr in email subject
Dmitriy Zaporozhets [Thu, 22 Aug 2013 11:49:57 +0000 (14:49 +0300)]
Recreate project satellite on rename or transfer
Michael Moll [Thu, 22 Aug 2013 11:17:58 +0000 (13:17 +0200)]
bind unicorn listener to 127.0.0.1
otherwise it will listen on 0.0.0.0
Dmitriy Zaporozhets [Thu, 22 Aug 2013 08:04:04 +0000 (08:04 +0000)]
Merge branch '25_000_installations' of /home/git/repositories/gitlab/gitlabhq
Robert Schilling [Thu, 22 Aug 2013 06:18:50 +0000 (08:18 +0200)]
Add 'hooks' to path blacklist.
Jacob Vosmaer [Wed, 21 Aug 2013 15:38:59 +0000 (17:38 +0200)]
Increase estimated number of GitLab installations
Dmitriy Zaporozhets [Wed, 21 Aug 2013 12:07:09 +0000 (15:07 +0300)]
Fix tests after can_create_team was removed
Dmitriy Zaporozhets [Wed, 21 Aug 2013 11:12:46 +0000 (04:12 -0700)]
Merge pull request #4826 from amouhzi/patch-1
Fix bug in ace-src-noconflict with Relative url.
Dmitriy Zaporozhets [Wed, 21 Aug 2013 11:11:52 +0000 (04:11 -0700)]
Merge pull request #4829 from hiroponz/render-not-found-when-failing-to-look-for-commit
Render not found when failing to look for commit