OSDN Git Service
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 [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
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
randx [Sat, 11 Aug 2012 21:36:43 +0000 (00:36 +0300)]
Temporary remove sqlite from travis
randx [Sat, 11 Aug 2012 21:34:14 +0000 (00:34 +0300)]
Merge branch 'jouve-fix_commits_dashboard'
Dmitriy Zaporozhets [Sun, 12 Aug 2012 06:49:48 +0000 (23:49 -0700)]
Merge pull request #1224 from tsigo/omniauth_sample_syntax
Fix invalid syntax in OmniAuth initializer sample
Robert Speicher [Sat, 11 Aug 2012 00:13:02 +0000 (20:13 -0400)]
Fix invalid syntax in OmniAuth initializer sample
randx [Sat, 11 Aug 2012 21:33:32 +0000 (00:33 +0300)]
Merge branch 'fix_commits_dashboard' of https://github.com/jouve/gitlabhq into jouve-fix_commits_dashboard
Conflicts:
app/views/events/_commit.html.haml
randx [Sat, 11 Aug 2012 20:33:49 +0000 (23:33 +0300)]
Switch to capybara-webkit for Cucumber
randx [Sat, 11 Aug 2012 20:17:18 +0000 (23:17 +0300)]
Trying to prevent travis broken builds by increase capybara timout for cucumber
randx [Sat, 11 Aug 2012 19:59:56 +0000 (22:59 +0300)]
Add comments to Gemfile
randx [Sat, 11 Aug 2012 19:48:55 +0000 (22:48 +0300)]
Rails version to 3.2.8
Dmitriy Zaporozhets [Sat, 11 Aug 2012 19:22:03 +0000 (12:22 -0700)]
Merge pull request #1166 from three18ti/master
Updated MySQL docs and Ubuntu auto-install script
randx [Sat, 11 Aug 2012 12:59:36 +0000 (15:59 +0300)]
Handle app crash on huge commits
Dmitriy Zaporozhets [Sat, 11 Aug 2012 08:26:44 +0000 (01:26 -0700)]
Merge pull request #1219 from tsigo/ruby19_hashes
Fully embrace Ruby 1.9 hash syntax
Robert Speicher [Fri, 10 Aug 2012 22:38:13 +0000 (18:38 -0400)]
Revert 1.9 Hash syntax in ValidCommit::BLOB_FILE
Features are still expecting the 1.8 syntax, which is fine in this case.
Robert Speicher [Fri, 10 Aug 2012 22:07:50 +0000 (18:07 -0400)]
Fully embrace Ruby 1.9 hash syntax
Didn't bother with files in db/, config/, or features/
Cyril [Fri, 10 Aug 2012 19:23:54 +0000 (21:23 +0200)]
fix commit events on dashboard
Dmitriy Zaporozhets [Fri, 10 Aug 2012 13:48:16 +0000 (06:48 -0700)]
Merge pull request #1208 from tsigo/issue_commonality
Consolidate functionality shared between Issue and MergeRequest
Dmitriy Zaporozhets [Fri, 10 Aug 2012 13:42:31 +0000 (06:42 -0700)]
Merge pull request #1198 from NARKOZ/preview_notes
ability to preview notes
Dmitriy Zaporozhets [Fri, 10 Aug 2012 13:26:04 +0000 (06:26 -0700)]
Merge pull request #984 from abevoelker/fix-init.d-resque
Fix resque worker becoming paused on restarts
Nihad Abbasov [Wed, 8 Aug 2012 09:25:24 +0000 (02:25 -0700)]
render notes preview on server-side
Robert Speicher [Thu, 9 Aug 2012 17:45:12 +0000 (13:45 -0400)]
Fix `search` class method for IssueCommonality
Also adds specs to the two affected classes that would have caught my
dumb mistake.
Robert Speicher [Thu, 9 Aug 2012 01:40:57 +0000 (21:40 -0400)]
Consolidate functionality shared between Issue and MergeRequest
Any associations, validations, delegates, scopes and methods that
were exactly the same in both Issue and MergeRequest models have been
moved to a new IssueCommonality module (role) that gets included by each
class.
There was actually quite a bit of duplication, because MergeRequests are
basically just specialized Issues.
Robert Speicher [Thu, 9 Aug 2012 01:26:56 +0000 (21:26 -0400)]
Add empty IssueCommonality module; include in Issue and MergeRequest
Dmitriy Zaporozhets [Thu, 9 Aug 2012 04:34:29 +0000 (07:34 +0300)]
Wiki pages page
Dmitriy Zaporozhets [Thu, 9 Aug 2012 03:36:55 +0000 (06:36 +0300)]
slim comment form
Dmitriy Zaporozhets [Thu, 9 Aug 2012 03:02:55 +0000 (06:02 +0300)]
Fixed gfm mailer
randx [Wed, 8 Aug 2012 14:08:43 +0000 (17:08 +0300)]
Fix github issue #1153
Dmitriy Zaporozhets [Thu, 9 Aug 2012 05:13:29 +0000 (08:13 +0300)]
Cucumber feature -> Merge Request
Dmitriy Zaporozhets [Fri, 10 Aug 2012 07:49:45 +0000 (10:49 +0300)]
Version to 2.8.0pre
randx [Wed, 8 Aug 2012 08:52:09 +0000 (11:52 +0300)]
Fixed markdown tests
Nihad Abbasov [Tue, 7 Aug 2012 13:17:29 +0000 (06:17 -0700)]
ability to preview notes
Jakub Jirutka [Sun, 5 Aug 2012 09:27:17 +0000 (11:27 +0200)]
Adding workaround for backward compatibility with legacy LDAP users
randx [Fri, 3 Aug 2012 00:28:02 +0000 (03:28 +0300)]
Fixed dashboard broken messages cause of glm
randx [Thu, 2 Aug 2012 21:20:09 +0000 (00:20 +0300)]
Gitlab Markdown help page
Dmitriy Zaporozhets [Tue, 7 Aug 2012 19:16:36 +0000 (12:16 -0700)]
Merge pull request #1183 from riyad/gitlab-flavored-markdown
Gitlab flavored markdown
Riyad Preukschas [Mon, 6 Aug 2012 03:08:22 +0000 (05:08 +0200)]
Update notifications mails and notify specs for GFM
Riyad Preukschas [Mon, 6 Aug 2012 01:16:06 +0000 (03:16 +0200)]
Fix missing @project errors
Riyad Preukschas [Mon, 6 Aug 2012 00:32:17 +0000 (02:32 +0200)]
Fix GFM helper to raise an exception when @project is not set
Riyad Preukschas [Mon, 6 Aug 2012 00:31:16 +0000 (02:31 +0200)]
Fix GFM specs for ids in markdown headings
Riyad Preukschas [Sun, 5 Aug 2012 23:48:20 +0000 (01:48 +0200)]
Merge branch 'master' into gitlab-flavored-markdown
randx [Thu, 2 Aug 2012 12:30:22 +0000 (15:30 +0300)]
Add admin credentials to installation docs
Valeriy Sizov [Sat, 4 Aug 2012 17:30:05 +0000 (10:30 -0700)]
Merge pull request #1147 from miks/master
Add automatic HTML id attributes to markdown headings to allow linking to content sections in wiki
Valeriy Sizov [Sat, 4 Aug 2012 17:17:14 +0000 (10:17 -0700)]
Merge pull request #1184 from karuna/master
Hook url should be able to contain http basic authentication
randx [Thu, 2 Aug 2012 06:48:24 +0000 (09:48 +0300)]
Rack mini profiler for dev env
randx [Sat, 4 Aug 2012 07:13:54 +0000 (10:13 +0300)]
Fix travis script