OSDN Git Service
vagrant [Thu, 28 Nov 2013 20:05:37 +0000 (20:05 +0000)]
added thumbsup and thumsdown emoji voting with rspec tests
Dmitriy Zaporozhets [Thu, 28 Nov 2013 17:26:21 +0000 (19:26 +0200)]
Merge remote-tracking branch 'origin/side-by-side'
Conflicts:
CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 28 Nov 2013 17:24:54 +0000 (17:24 +0000)]
Merge branch 'wiki-reference' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 28 Nov 2013 17:24:36 +0000 (17:24 +0000)]
Merge branch 'auto_disable_color' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 28 Nov 2013 17:23:54 +0000 (17:23 +0000)]
Merge branch 'unofficial-is-unclear' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 28 Nov 2013 10:30:24 +0000 (10:30 +0000)]
Merge branch 'drop_rjs' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 28 Nov 2013 09:38:20 +0000 (11:38 +0200)]
Drop rjs from Infinite scrolling
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 28 Nov 2013 08:36:13 +0000 (10:36 +0200)]
Add internal projects to CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sytse Sijbrandij [Thu, 28 Nov 2013 06:57:56 +0000 (07:57 +0100)]
Unsupported is unclear.
Sytse Sijbrandij [Wed, 27 Nov 2013 16:57:55 +0000 (17:57 +0100)]
Button name has an upcase in it.
Sytse Sijbrandij [Wed, 27 Nov 2013 16:26:04 +0000 (17:26 +0100)]
Wiki page url changed due to title cleanup.
Dmitriy Zaporozhets [Wed, 27 Nov 2013 14:01:36 +0000 (14:01 +0000)]
Merge branch 'improve/show_issue_state' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 27 Nov 2013 13:00:57 +0000 (15:00 +0200)]
Capybara tests with first-child/last-child randomly fails so replaced with alternative method
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 12:20:49 +0000 (04:20 -0800)]
Merge pull request #5701 from gitlabhq/feature/internal_projects
Feature: Internal projects
Dmitriy Zaporozhets [Wed, 27 Nov 2013 11:40:32 +0000 (13:40 +0200)]
Remove unnecessary \" symbols
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 11:26:16 +0000 (13:26 +0200)]
Restyle public access help page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 11:13:33 +0000 (13:13 +0200)]
Improve UX of project visiblity level. Improve "Public Access" help page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 10:22:19 +0000 (10:22 +0000)]
Show issue open state as label
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:51:46 +0000 (11:51 +0200)]
Merge branch 'authenticated_public_mode' of https://github.com/jhollingsworth/gitlabhq into feature/internal_projects
Conflicts:
app/models/project.rb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:31:50 +0000 (09:31 +0000)]
Merge branch 'improve/preview_button' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:31:41 +0000 (09:31 +0000)]
Merge branch 'bug/default_branch_cached' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:31:29 +0000 (09:31 +0000)]
Merge branch 'feature/readonly_ldap_email' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:29:52 +0000 (11:29 +0200)]
Minor UI improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:18:33 +0000 (11:18 +0200)]
Rollback preview button href
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:14:42 +0000 (11:14 +0200)]
Improve preview/edit links for comment form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jacob Vosmaer [Wed, 27 Nov 2013 09:07:26 +0000 (10:07 +0100)]
Disable rake color output unless connected to TTY
Dmitriy Zaporozhets [Wed, 27 Nov 2013 08:49:59 +0000 (10:49 +0200)]
Fix default branch being cached and show old one after change
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 08:32:37 +0000 (10:32 +0200)]
Read-only email field for LDAP user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 08:04:00 +0000 (10:04 +0200)]
Use 1.9 hash syntax for some tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sytse Sijbrandij [Wed, 27 Nov 2013 08:00:14 +0000 (09:00 +0100)]
Conventional naming for diff modes.
Dmitriy Zaporozhets [Wed, 27 Nov 2013 07:49:21 +0000 (09:49 +0200)]
gitlab-grack up to 1.1.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jason Hollingsworth [Wed, 6 Nov 2013 15:13:21 +0000 (09:13 -0600)]
Adding authenticated public mode (internal).
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
Dmitriy Zaporozhets [Tue, 26 Nov 2013 18:34:18 +0000 (18:34 +0000)]
Merge branch '6_3_update' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 26 Nov 2013 11:34:20 +0000 (13:34 +0200)]
Mention parallel diff feature in CHANGELOG for 6.4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 26 Nov 2013 11:32:11 +0000 (13:32 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 26 Nov 2013 11:31:42 +0000 (03:31 -0800)]
Merge pull request #5308 from Popl7/parallel-diffs-side-by-side
diff view on commit with parallel diff view
Dmitriy Zaporozhets [Tue, 26 Nov 2013 11:28:21 +0000 (11:28 +0000)]
Merge branch 'show_ruby_version' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Tue, 26 Nov 2013 10:14:25 +0000 (11:14 +0100)]
Show ruby version on admin dashboard
Jacob Vosmaer [Tue, 26 Nov 2013 09:31:02 +0000 (10:31 +0100)]
Explain and streamline upgrade steps
Jacob Vosmaer [Tue, 26 Nov 2013 09:30:56 +0000 (10:30 +0100)]
Fix whitespace
Jacob Vosmaer [Tue, 26 Nov 2013 09:22:23 +0000 (10:22 +0100)]
No need to re-download the init script
Jacob Vosmaer [Tue, 26 Nov 2013 09:22:04 +0000 (10:22 +0100)]
Remove outdated steps from 6.2-to-6.3.md
Dmitriy Zaporozhets [Tue, 26 Nov 2013 08:08:46 +0000 (10:08 +0200)]
Fix overflow on project home page for long names
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 20:33:04 +0000 (22:33 +0200)]
Fix session spec because of password length
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 20:21:11 +0000 (22:21 +0200)]
Reduce strong html tag usage for dashboard events
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 20:13:13 +0000 (22:13 +0200)]
Extend CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 20:10:18 +0000 (22:10 +0200)]
More compact issues page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 19:36:17 +0000 (21:36 +0200)]
More fixes to test because of long password
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 19:23:05 +0000 (21:23 +0200)]
Show broadcast messages on group, profile and project settings pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 19:12:46 +0000 (21:12 +0200)]
Bump gitlab-grit gem. Fixes another 500 error with submodules
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 18:07:55 +0000 (20:07 +0200)]
Fix tests after user password length was changed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 16:58:00 +0000 (18:58 +0200)]
Minor ui fixes for selects at issues page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 16:57:44 +0000 (18:57 +0200)]
Added ability to clear milestone/assignee during bulk update
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 16:57:08 +0000 (18:57 +0200)]
Update chosen-rails
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 16:24:45 +0000 (18:24 +0200)]
Include API session route under rack protection
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 16:11:03 +0000 (18:11 +0200)]
Minimal password length increased
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 15:59:12 +0000 (17:59 +0200)]
Prevent 500 if data[:commits] is nil for event
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 15:46:16 +0000 (17:46 +0200)]
Fix empty sort label on issues page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 15:43:12 +0000 (15:43 +0000)]
Merge branch 'update/gems' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 25 Nov 2013 15:41:02 +0000 (17:41 +0200)]
Fix markdown tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 14:53:44 +0000 (16:53 +0200)]
Update gitlab-linguist version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jacob Vosmaer [Mon, 25 Nov 2013 14:42:54 +0000 (14:42 +0000)]
Merge branch 'diy' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Mon, 25 Nov 2013 14:29:08 +0000 (15:29 +0100)]
Here is undefined.
Dmitriy Zaporozhets [Mon, 25 Nov 2013 13:28:30 +0000 (13:28 +0000)]
Merge branch 'ruby_update' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 25 Nov 2013 10:32:47 +0000 (12:32 +0200)]
New gem versions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 25 Nov 2013 13:01:47 +0000 (15:01 +0200)]
Revert "New gem versions"
This reverts commit
f74d4f20f234b8833628a2bc044cea2d1e953811.
Jacob Vosmaer [Mon, 25 Nov 2013 12:59:35 +0000 (13:59 +0100)]
Be more specific about what Ruby to use
Jacob Vosmaer [Mon, 25 Nov 2013 12:55:09 +0000 (13:55 +0100)]
Add Ruby upgrade instructions
Dmitriy Zaporozhets [Mon, 25 Nov 2013 10:33:18 +0000 (12:33 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 25 Nov 2013 10:32:47 +0000 (12:32 +0200)]
New gem versions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sytse Sijbrandij [Mon, 25 Nov 2013 10:00:35 +0000 (02:00 -0800)]
Merge pull request #5684 from frdmn/master
Update installation.md to use 6-3-stable branch
Dmitriy Zaporozhets [Mon, 25 Nov 2013 09:47:55 +0000 (11:47 +0200)]
Start writing doc about GitLab architecture for developers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jonas Friedmann [Mon, 25 Nov 2013 08:59:26 +0000 (09:59 +0100)]
Update installation.md to use 6-3-stable branch
Dmitriy Zaporozhets [Sun, 24 Nov 2013 20:06:17 +0000 (22:06 +0200)]
Starting 6.4.0.pre
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 24 Nov 2013 08:48:08 +0000 (00:48 -0800)]
Merge pull request #5675 from augustf/patch-1
Noted the change to the gitlab-shell config.yml
August [Sun, 24 Nov 2013 05:09:55 +0000 (00:09 -0500)]
Noted the change to the gitlab-shell config.yml, which changed substantially in recent versions and broke the upgrade when not updated
Dmitriy Zaporozhets [Sat, 23 Nov 2013 20:10:58 +0000 (12:10 -0800)]
Merge pull request #5661 from jasonblanchard/sorting-project-issues
Added sorting to project issues page
Jason Blanchard [Wed, 20 Nov 2013 22:59:50 +0000 (17:59 -0500)]
Added sorting to project issues page
Dmitriy Zaporozhets [Sat, 23 Nov 2013 19:43:18 +0000 (21:43 +0200)]
Enable redis in travis
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 23 Nov 2013 14:49:00 +0000 (14:49 +0000)]
Merge branch 'update_ruby_master' of /home/git/repositories/gitlab/gitlabhq
Achilleas Pipinellis [Sat, 23 Nov 2013 10:33:24 +0000 (12:33 +0200)]
Update ruby to patchlevel 353 (security update)
https://www.ruby-lang.org/en/news/2013/11/22/heap-overflow-in-floating-point-parsing-cve-2013-4164/
Dmitriy Zaporozhets [Sat, 23 Nov 2013 10:20:32 +0000 (02:20 -0800)]
Merge pull request #5640 from carlosparamio/assembla_service
Integration with Assembla
Dmitriy Zaporozhets [Sat, 23 Nov 2013 09:10:20 +0000 (01:10 -0800)]
Merge pull request #5654 from sairam/patch-1
minor fix to command
Sairam Kunala [Fri, 22 Nov 2013 13:58:27 +0000 (15:58 +0200)]
minor fix to command
Dmitriy Zaporozhets [Fri, 22 Nov 2013 13:18:47 +0000 (15:18 +0200)]
Fix 6.3 branch name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 22 Nov 2013 10:58:37 +0000 (12:58 +0200)]
Version to 6.3.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 22 Nov 2013 10:55:20 +0000 (12:55 +0200)]
Improve refs parsing for git over http
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 22 Nov 2013 10:41:55 +0000 (12:41 +0200)]
Cleanup parsed refs for git over HTTP
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 21 Nov 2013 21:54:39 +0000 (13:54 -0800)]
Merge pull request #5647 from lordjabez/develop
Fix grammar in fork error message.
Judson D Neer [Thu, 21 Nov 2013 19:53:48 +0000 (11:53 -0800)]
Fix grammar in fork error message.
Dmitriy Zaporozhets [Thu, 21 Nov 2013 19:02:45 +0000 (19:02 +0000)]
Merge branch 'os-requirements' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 21 Nov 2013 18:39:57 +0000 (18:39 +0000)]
Merge branch 'tests_limitation_skip' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Thu, 21 Nov 2013 18:38:05 +0000 (19:38 +0100)]
Ensure customers know that GitLab.com supports RHEL.
Marin Jankovski [Thu, 21 Nov 2013 15:04:23 +0000 (16:04 +0100)]
No limits when testing.
Carlos Paramio [Thu, 21 Nov 2013 12:18:02 +0000 (13:18 +0100)]
Integration with Assembla
Dmitriy Zaporozhets [Thu, 21 Nov 2013 08:03:00 +0000 (10:03 +0200)]
Time for release candidate
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 21 Nov 2013 07:46:09 +0000 (09:46 +0200)]
Style resend confirmation instructions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 21 Nov 2013 07:45:37 +0000 (07:45 +0000)]
Merge branch 'backup_commands' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 20 Nov 2013 17:27:49 +0000 (19:27 +0200)]
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 20 Nov 2013 15:29:50 +0000 (17:29 +0200)]
Render markdown in snippets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
OSDN Git Service
