OSDN Git Service
Dmitriy Zaporozhets [Mon, 27 Aug 2012 18:04:00 +0000 (11:04 -0700)]
Merge pull request #993 from veprbl/fix_archiving_prefix
Download button: put files into a directory
Dmitriy Zaporozhets [Mon, 27 Aug 2012 11:58:32 +0000 (04:58 -0700)]
Merge pull request #1301 from Mikulas/help-web-hooks-typo
fix web hooks help view commit count off by one
Dmitriy Zaporozhets [Mon, 27 Aug 2012 08:33:06 +0000 (01:33 -0700)]
Merge pull request #1307 from purwandi/master
use high quality icon on folder icon
Dmitriy Zaporozhets [Mon, 27 Aug 2012 06:40:55 +0000 (23:40 -0700)]
Merge pull request #1305 from AlexDenisov/project_access_notifications
Project access notifications
Purwandi [Mon, 27 Aug 2012 05:43:28 +0000 (12:43 +0700)]
Replace folder icon to use high quality
Alex Denisov [Sun, 26 Aug 2012 21:32:03 +0000 (00:32 +0300)]
Send notification on update UserProject relation (access changed)
Alex Denisov [Sun, 26 Aug 2012 21:13:03 +0000 (00:13 +0300)]
Send notifiation on create UserProject relation (access granted)
randx [Sat, 25 Aug 2012 20:39:01 +0000 (23:39 +0300)]
Project git clone panel
Dmitriy Zaporozhets [Sat, 25 Aug 2012 20:04:41 +0000 (13:04 -0700)]
Merge pull request #1110 from gliptak/patch-1
Display configured git repository location on error page
Dmitriy Zaporozhets [Sat, 25 Aug 2012 20:03:44 +0000 (13:03 -0700)]
Merge pull request #1300 from tsigo/spec_reorganize
Spec cleanup/reorganization
Mikuláš Dítě [Sat, 25 Aug 2012 18:48:30 +0000 (20:48 +0200)]
fix web hooks help view commit count off by one
Robert Speicher [Sat, 25 Aug 2012 17:54:38 +0000 (13:54 -0400)]
Minor cleanup to Milestone model and spec
Back-ported from my still-in-progress major cleanup.
Robert Speicher [Sat, 25 Aug 2012 17:43:55 +0000 (13:43 -0400)]
Clean up request specs
Robert Speicher [Sat, 25 Aug 2012 17:31:50 +0000 (13:31 -0400)]
Add a simple `api` method to ApiHelpers, replacing api_prefix
See docs for usage
Robert Speicher [Thu, 23 Aug 2012 09:19:40 +0000 (05:19 -0400)]
Cleanup spec/support folder and spec/spec_helper
Changes:
* Move spec/monkeypatch to spec/support
* Remove unused support/shared_examples
* Move support/api to support/api_helpers to match module name
* Move support/login to support/login_helpers to match module name
* Move API specs to requests/api (convention over configuration)
* Remove unused support/js_patch
* Simplify login_as helper
* Move DatabaseCleaner stuff to its own support file
* Remove unnecessary configuration and requires from spec_helper
randx [Sat, 25 Aug 2012 17:31:19 +0000 (20:31 +0300)]
Admin area -> user form
Robert Speicher [Thu, 16 Aug 2012 03:16:33 +0000 (23:16 -0400)]
Move observer specs out of spec/models into spec/observers
randx [Sat, 25 Aug 2012 16:47:00 +0000 (19:47 +0300)]
better flash message style
randx [Sat, 25 Aug 2012 16:42:34 +0000 (19:42 +0300)]
scss refactoring
randx [Sat, 25 Aug 2012 16:21:11 +0000 (19:21 +0300)]
Move snippets api doc to separate file
randx [Fri, 24 Aug 2012 12:34:27 +0000 (15:34 +0300)]
Show labels specific to project
Dmitriy Zaporozhets [Sat, 25 Aug 2012 13:16:40 +0000 (06:16 -0700)]
Merge pull request #1295 from jouve/fix_mr_form
fix merge request form
Dmitriy Zaporozhets [Sat, 25 Aug 2012 13:15:59 +0000 (06:15 -0700)]
Merge pull request #1296 from Wetpaint/master
Hide the gravatar tip in the profile menu if gravatar is disabled.
Dmitriy Zaporozhets [Sat, 25 Aug 2012 13:15:18 +0000 (06:15 -0700)]
Merge pull request #1297 from SaitoWu/issues/1269
fix git push body bigger than 112k problem
Saito [Sat, 25 Aug 2012 07:24:21 +0000 (15:24 +0800)]
fix git push body bigger than 112k problem
Joe Hillenbrand [Fri, 24 Aug 2012 23:04:07 +0000 (16:04 -0700)]
Hide gravatar tip if gravatar is disabled.
Cyril [Fri, 24 Aug 2012 22:22:45 +0000 (00:22 +0200)]
fix merge request form
randx [Fri, 24 Aug 2012 10:17:19 +0000 (13:17 +0300)]
Final fix for dashboard cucumber feature
randx [Fri, 24 Aug 2012 10:07:14 +0000 (13:07 +0300)]
Merge branch 'feature/labels'
randx [Fri, 24 Aug 2012 10:05:40 +0000 (13:05 +0300)]
Feature: Labels page. Index page
randx [Fri, 24 Aug 2012 09:17:05 +0000 (12:17 +0300)]
Fix dashboard issues atom feed rspec
randx [Fri, 24 Aug 2012 09:03:48 +0000 (12:03 +0300)]
Up to 2.8.2
randx [Fri, 24 Aug 2012 08:48:30 +0000 (11:48 +0300)]
Trying to get rid of random dashboard/issues cucumber fail
Dmitriy Zaporozhets [Wed, 22 Aug 2012 11:33:50 +0000 (04:33 -0700)]
Merge pull request #1239 from tsigo/disable_gravatar
Allow disabling Gravatars in gitlab.yml settings
Dmitriy Zaporozhets [Wed, 22 Aug 2012 00:56:53 +0000 (03:56 +0300)]
1. Better message if no ssh key
2. SSH Keys Help page
randx [Tue, 21 Aug 2012 22:25:11 +0000 (01:25 +0300)]
draper Gemfile.lock
Dmitriy Zaporozhets [Fri, 24 Aug 2012 08:29:52 +0000 (01:29 -0700)]
Merge pull request #1286 from steveklabnik/master
Misspelled Draper
Dmitriy Zaporozhets [Fri, 24 Aug 2012 08:29:05 +0000 (01:29 -0700)]
Merge pull request #1284 from jouve/fix-inline-forms
fix inline forms
Dmitriy Zaporozhets [Fri, 24 Aug 2012 08:09:21 +0000 (01:09 -0700)]
Merge pull request #1285 from tsigo/gemfile_cleanup
Gemfile cleanup
Steve Klabnik [Fri, 24 Aug 2012 00:11:37 +0000 (17:11 -0700)]
Fix Draper spelling in Gemfile
Steve Klabnik [Fri, 24 Aug 2012 00:01:30 +0000 (17:01 -0700)]
Misspelled Draper
:)
Robert Speicher [Thu, 23 Aug 2012 23:21:55 +0000 (19:21 -0400)]
Remove unused minitest and turn gems
Robert Speicher [Thu, 23 Aug 2012 23:21:20 +0000 (19:21 -0400)]
Move gitlab_meta gem to :production group
Robert Speicher [Thu, 23 Aug 2012 23:20:28 +0000 (19:20 -0400)]
Remove rails-footnotes gem and its related files
Cyril [Thu, 23 Aug 2012 21:04:43 +0000 (23:04 +0200)]
fix inline forms
Dmitriy Zaporozhets [Thu, 23 Aug 2012 19:06:03 +0000 (12:06 -0700)]
Merge pull request #1283 from riyad/improve-gfm-code-docs
Improve GFM code documentation
Riyad Preukschas [Thu, 23 Aug 2012 18:10:06 +0000 (20:10 +0200)]
Improve GFM code documentation
Dmitriy Zaporozhets [Thu, 23 Aug 2012 13:56:55 +0000 (06:56 -0700)]
Merge pull request #1231 from NARKOZ/preview_notes
Preview window is not closed after post
Dmitriy Zaporozhets [Thu, 23 Aug 2012 11:26:22 +0000 (04:26 -0700)]
Merge pull request #1275 from tsigo/no_ci_simplecov
Don't run SimpleCov on Travis
Robert Speicher [Thu, 23 Aug 2012 11:24:25 +0000 (07:24 -0400)]
Don't run SimpleCov on Travis
Dmitriy Zaporozhets [Thu, 23 Aug 2012 06:17:18 +0000 (09:17 +0300)]
Up to 2.8.1
Dmitriy Zaporozhets [Thu, 23 Aug 2012 07:32:37 +0000 (00:32 -0700)]
Merge pull request #1263 from dosire/merge_base_for_merge_request
Show only the commits that are newer in the merge request.
Dmitriy Zaporozhets [Thu, 23 Aug 2012 05:28:00 +0000 (08:28 +0300)]
Fix meta gem version
Dmitriy Zaporozhets [Thu, 23 Aug 2012 05:15:30 +0000 (08:15 +0300)]
gitlab_meta gem added
Dmitriy Zaporozhets [Tue, 21 Aug 2012 22:15:26 +0000 (01:15 +0300)]
Up to 2.8
Sytse Sijbrandij [Tue, 21 Aug 2012 21:07:11 +0000 (23:07 +0200)]
Show only the commits that are newer in the merge request.
randx [Tue, 21 Aug 2012 19:44:49 +0000 (22:44 +0300)]
Updated app:status & docs with hooks. Removed write_hooks from app:setup
Dmitriy Zaporozhets [Wed, 22 Aug 2012 06:27:03 +0000 (23:27 -0700)]
Merge pull request #1266 from tsigo/cucumber_speedup
Speed up the "Project Network Graph" cucumber feature
Robert Speicher [Wed, 22 Aug 2012 02:48:15 +0000 (22:48 -0400)]
Fix cucumber failure that only happened on Travis
Robert Speicher [Wed, 22 Aug 2012 02:20:09 +0000 (22:20 -0400)]
Speed up the "Project Network Graph" cucumber feature
This change involves stubbing out the call to `Grit::Commit.find_all`
and limiting the number of commits to 10 vs. the standard of 650 used by
`Gitlab::GraphCommit.to_graph`.
Prior to this change, this single feature required almost 3 minutes of
running time and over 2 GB of memory on my machine. Now it takes less
than 3 seconds.
randx [Tue, 21 Aug 2012 18:34:33 +0000 (21:34 +0300)]
Merge branch 'refactor_notify' of https://github.com/tsigo/gitlabhq into tsigo-refactor_notify
randx [Tue, 21 Aug 2012 18:26:56 +0000 (21:26 +0300)]
Refactoring & minor css changes
randx [Tue, 21 Aug 2012 17:53:33 +0000 (20:53 +0300)]
Better fonts for all code like wiki etc
randx [Tue, 21 Aug 2012 17:24:04 +0000 (20:24 +0300)]
project should not respond to write_hooks any more
randx [Tue, 21 Aug 2012 17:14:06 +0000 (20:14 +0300)]
Handle post-receive files via gitolite, not gitlab
Dmitriy Zaporozhets [Tue, 21 Aug 2012 05:20:11 +0000 (08:20 +0300)]
Show only tm events related to this project
randx [Tue, 21 Aug 2012 05:39:23 +0000 (08:39 +0300)]
Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap
Conflicts:
app/models/user.rb
Robert Speicher [Tue, 21 Aug 2012 03:18:57 +0000 (23:18 -0400)]
Remove more duplication in the Notify mailer
Robert Speicher [Tue, 21 Aug 2012 03:04:53 +0000 (23:04 -0400)]
Remove some duplication in the Notify mailer
randx [Mon, 20 Aug 2012 19:51:37 +0000 (22:51 +0300)]
Added font for head panel. Major restyle for header
Jakub Jirutka [Mon, 20 Aug 2012 10:58:03 +0000 (12:58 +0200)]
fix condition in find_for_ldap_auth
randx [Sun, 19 Aug 2012 09:14:36 +0000 (12:14 +0300)]
Fix dashboard random test fail
randx [Sun, 19 Aug 2012 08:44:48 +0000 (11:44 +0300)]
Project /lib cleanup
randx [Sun, 19 Aug 2012 08:36:37 +0000 (11:36 +0300)]
Headless gem added
randx [Sun, 19 Aug 2012 07:58:10 +0000 (10:58 +0300)]
Move graph_commit under gitlab module
randx [Sun, 19 Aug 2012 07:20:42 +0000 (10:20 +0300)]
Specify charlock holmes version in installation docs
randx [Sat, 18 Aug 2012 21:45:46 +0000 (00:45 +0300)]
Text message for mergeing MR
randx [Sat, 18 Aug 2012 21:08:20 +0000 (00:08 +0300)]
Restored margin for text in notes
randx [Sat, 18 Aug 2012 20:53:58 +0000 (23:53 +0300)]
Fix branch selector. Few css fixed also
Dmitriy Zaporozhets [Fri, 17 Aug 2012 06:26:59 +0000 (09:26 +0300)]
Few css improvements
Dmitriy Zaporozhets [Fri, 17 Aug 2012 06:09:11 +0000 (09:09 +0300)]
Application cleanup
Dmitriy Zaporozhets [Fri, 17 Aug 2012 05:33:56 +0000 (22:33 -0700)]
Merge pull request #1247 from tsigo/feature/no_milestone_filter
Allow filtering issues that have no milestone or assignee
Robert Speicher [Thu, 16 Aug 2012 22:13:22 +0000 (18:13 -0400)]
Combine unassigned_issue and unassigned_milestone into unassigned_filter
Dmitriy Zaporozhets [Thu, 16 Aug 2012 21:11:08 +0000 (14:11 -0700)]
Merge pull request #1230 from tsigo/hooray_apostrophes
Correct usage of "Can't"
Robert Speicher [Thu, 16 Aug 2012 18:03:06 +0000 (14:03 -0400)]
Merge branch 'master' into hooray_apostrophes
Dmitriy Zaporozhets [Thu, 16 Aug 2012 06:13:50 +0000 (09:13 +0300)]
Restyled erros pages & avatar class
Robert Speicher [Thu, 16 Aug 2012 01:06:08 +0000 (21:06 -0400)]
Allow disabling Gravatars in gitlab.yml settings
Closes #1237
Dmitriy Zaporozhets [Wed, 15 Aug 2012 07:08:57 +0000 (00:08 -0700)]
Merge pull request #1234 from studiofrenetic/fix-admin-hook-tab
Fix current class for hooks tab in admin section
Martin Bastien [Wed, 15 Aug 2012 04:03:13 +0000 (00:03 -0400)]
Fix current class for hooks tab in admin section
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
Robert Speicher [Tue, 14 Aug 2012 21:26:38 +0000 (17:26 -0400)]
More minor translation/grammar fixes on error pages
Dmitriy Zaporozhets [Tue, 14 Aug 2012 11:44:02 +0000 (04:44 -0700)]
Merge pull request #1232 from tsigo/refactor_gfm
GFM Refactoring
Robert Speicher [Tue, 14 Aug 2012 08:32:19 +0000 (04:32 -0400)]
GFM refactor: Move the actual parsing to a class under the Gitlab module
Robert Speicher [Tue, 14 Aug 2012 07:49:55 +0000 (03:49 -0400)]
GFM refactor: Update pattern to avoid an extra HTML entities check
Robert Speicher [Tue, 14 Aug 2012 06:48:23 +0000 (02:48 -0400)]
GFM refactor: Simplify the regex pattern
Makes use of 'extended' patterns to add comments to the groups, and also
reduces the total number of groups to just those that are used.
Nihad Abbasov [Tue, 14 Aug 2012 08:24:27 +0000 (01:24 -0700)]
fix note preview link, and hide preview and errors after posting a comment
Robert Speicher [Fri, 10 Aug 2012 23:47:54 +0000 (19:47 -0400)]
"Cant" -> "Can't"
Robert Speicher [Tue, 14 Aug 2012 00:49:18 +0000 (20:49 -0400)]
Allow filtering by issues with no assigned... assignee
Continues #1222
Dmitriy Zaporozhets [Mon, 13 Aug 2012 05:52:10 +0000 (08:52 +0300)]
Modern theme restyled. Better Profile -> Ui page
Robert Speicher [Mon, 13 Aug 2012 05:38:00 +0000 (01:38 -0400)]
Allow filtering by issues with no assigned milestone
Closes #1222
Dmitriy Zaporozhets [Mon, 13 Aug 2012 05:32:10 +0000 (08:32 +0300)]
rspec to capybara-webkit. simplercov now use cucumber