OSDN Git Service
Dmitriy Zaporozhets [Fri, 16 Nov 2012 10:54:35 +0000 (12:54 +0200)]
Another try for phantom
Dmitriy Zaporozhets [Fri, 16 Nov 2012 10:47:09 +0000 (12:47 +0200)]
new phantomjs for travis
Valeriy Sizov [Fri, 16 Nov 2012 10:33:19 +0000 (02:33 -0800)]
Merge pull request #1995 from gitlabhq/feature/poltergeist
Use poltergeist instaead of capybara-webkit
Dmitriy Zaporozhets [Fri, 16 Nov 2012 10:27:39 +0000 (12:27 +0200)]
Use poltergeist instaead of capybara-webkit
Riyad Preukschas [Wed, 14 Nov 2012 13:36:51 +0000 (14:36 +0100)]
Fix Notes JS
Also fixes #1983
Dmitriy Zaporozhets [Wed, 14 Nov 2012 11:14:46 +0000 (13:14 +0200)]
Rails up to 3.2.9
Riyad Preukschas [Wed, 14 Nov 2012 00:20:37 +0000 (01:20 +0100)]
Fix specs
Dmitriy Zaporozhets [Tue, 13 Nov 2012 20:11:56 +0000 (22:11 +0200)]
Improved seeds for development env
Dmitriy Zaporozhets [Tue, 13 Nov 2012 19:26:36 +0000 (21:26 +0200)]
Improve Commits stats code
Dmitriy Zaporozhets [Tue, 13 Nov 2012 16:45:03 +0000 (08:45 -0800)]
Merge pull request #1928 from kouno/cleanup-factories
Remove backward compatibility of factories.
Dmitriy Zaporozhets [Tue, 13 Nov 2012 16:44:05 +0000 (08:44 -0800)]
Merge pull request #1958 from japgolly/git_commit_fix
Ensure git can commit and prevent it from failing silently
Saito [Tue, 13 Nov 2012 15:32:18 +0000 (07:32 -0800)]
Merge pull request #1968 from shtirlic/fix_thin
Update thin closes #1765 and maybe #1051
Vincent Bonmalais [Tue, 6 Nov 2012 03:31:55 +0000 (14:31 +1100)]
Remove backward compatibility of factories.
Dmitriy Zaporozhets [Tue, 13 Nov 2012 10:36:41 +0000 (12:36 +0200)]
Fix loader hiding when create new project
David Barri [Sun, 11 Nov 2012 10:27:55 +0000 (21:27 +1100)]
Merge remote-tracking branch 'gitlabhq/master' into git_commit_fix
Conflicts:
doc/install/installation.md
Dmitriy Zaporozhets [Sat, 10 Nov 2012 22:08:42 +0000 (00:08 +0200)]
Improve lists. Remove unneccessary padding
Dmitriy Zaporozhets [Sat, 10 Nov 2012 21:45:13 +0000 (23:45 +0200)]
Fix margin-right for some avatars
randx [Sat, 10 Nov 2012 21:33:10 +0000 (23:33 +0200)]
Added feature test for stats
randx [Sat, 10 Nov 2012 21:08:47 +0000 (23:08 +0200)]
Stats page
shtirlic [Sat, 10 Nov 2012 16:30:22 +0000 (20:30 +0400)]
Update thin closes #1765 and maybe #1051
Riyad Preukschas [Fri, 9 Nov 2012 23:55:56 +0000 (00:55 +0100)]
Fix 500s because of "missing" lexer
Saito [Fri, 9 Nov 2012 17:36:55 +0000 (01:36 +0800)]
linguist will take care of this
Saito [Fri, 9 Nov 2012 17:06:20 +0000 (01:06 +0800)]
linguist and web browser will take care of mimetype and encoding problem.
Saito [Fri, 9 Nov 2012 16:09:31 +0000 (08:09 -0800)]
Merge pull request #1964 from jdamick/patch-1
Update app/views/notify/project_access_granted_email.html.haml
jdamick [Fri, 9 Nov 2012 16:03:42 +0000 (11:03 -0500)]
Update app/views/notify/project_access_granted_email.html.haml
changing wording to sound more better.
Dmitriy Zaporozhets [Fri, 9 Nov 2012 13:24:28 +0000 (15:24 +0200)]
charlock_holmes up to 0.6.9 for travis and setup docs
Dmitriy Zaporozhets [Fri, 9 Nov 2012 13:17:50 +0000 (15:17 +0200)]
Use grit_ext fork of gitlabhq
Dmitriy Zaporozhets [Fri, 9 Nov 2012 13:18:15 +0000 (05:18 -0800)]
Merge pull request #1956 from SaitoWu/grit_ext
release a new version of grit_ext, added it into Gitlab.
Valeriy Sizov [Fri, 9 Nov 2012 09:15:36 +0000 (01:15 -0800)]
Merge pull request #1955 from dosire/patch-2
Add pointer about alternative platforms
David Barri [Thu, 8 Nov 2012 21:32:00 +0000 (08:32 +1100)]
Fix for git commit when nothing to commit.
Turns out git commit returns with 128 when user.name config not present.
Saito [Thu, 8 Nov 2012 17:59:14 +0000 (01:59 +0800)]
bump grit_ext version to 0.6.0
Saito [Thu, 8 Nov 2012 17:41:07 +0000 (01:41 +0800)]
remove encode lib, clean all encoded area.
Saito [Thu, 8 Nov 2012 14:47:12 +0000 (22:47 +0800)]
add grit_ext to gemfile
Sytse Sijbrandij [Thu, 8 Nov 2012 14:43:01 +0000 (15:43 +0100)]
Add pointer about alternative platforms
David Barri [Wed, 7 Nov 2012 23:47:11 +0000 (10:47 +1100)]
Fixed issue with git commit silently failing.
Also updated status task and installation instuctions.
Dmitriy Zaporozhets [Wed, 7 Nov 2012 15:49:52 +0000 (17:49 +0200)]
Sign in screen: removed hr, added clearfix
Dmitriy Zaporozhets [Wed, 7 Nov 2012 15:32:39 +0000 (17:32 +0200)]
Annotated
Dmitriy Zaporozhets [Wed, 7 Nov 2012 15:15:41 +0000 (17:15 +0200)]
Fix github issue #1946
Dmitriy Zaporozhets [Wed, 7 Nov 2012 12:01:23 +0000 (14:01 +0200)]
Remove gitlab-cli and Proc.prod. Use foreman for development and unicorn for production.
Dmitriy Zaporozhets [Wed, 7 Nov 2012 11:56:48 +0000 (13:56 +0200)]
Dashboard steps: 1.9 syntax & use of create instead of Factory
Dmitriy Zaporozhets [Wed, 7 Nov 2012 11:51:20 +0000 (03:51 -0800)]
Merge pull request #1720 from coagulant/wiki_search
Wiki search
Valeriy Sizov [Wed, 7 Nov 2012 11:50:42 +0000 (03:50 -0800)]
Merge pull request #1735 from NARKOZ/api
API fixes
Riyad Preukschas [Wed, 7 Nov 2012 11:31:26 +0000 (13:31 +0200)]
Line anchors for file view
Valery Sizov [Tue, 6 Nov 2012 22:57:33 +0000 (22:57 +0000)]
Merge branch 'gitolite_custom_config' of dev.gitlabhq.com:gitlabhq
Valeriy Sizov [Tue, 6 Nov 2012 22:47:33 +0000 (00:47 +0200)]
gitolite custom config
Riyad Preukschas [Tue, 6 Nov 2012 20:15:25 +0000 (21:15 +0100)]
Log caught exceptions
Dmitriy Zaporozhets [Tue, 6 Nov 2012 17:31:01 +0000 (19:31 +0200)]
Styled chosen css. Lighter box shadow for blocks
Dmitriy Zaporozhets [Tue, 6 Nov 2012 15:51:40 +0000 (17:51 +0200)]
version to 3.1.0pre
Dmitriy Zaporozhets [Tue, 6 Nov 2012 11:53:15 +0000 (11:53 +0000)]
Merge branch 'feature/dashboard_event_filters' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Tue, 6 Nov 2012 11:47:43 +0000 (13:47 +0200)]
Changed default icon for gravatar. Moved filter out of layout
Dmitriy Zaporozhets [Mon, 5 Nov 2012 18:12:26 +0000 (20:12 +0200)]
Added EventFilter class. Compeleted first version of dashbaord filtering
Dmitriy Zaporozhets [Mon, 5 Nov 2012 11:27:48 +0000 (03:27 -0800)]
Merge pull request #1914 from tsigo/issue/1910
Fix double icon on header button hover
Valeriy Sizov [Mon, 5 Nov 2012 09:29:03 +0000 (01:29 -0800)]
Merge pull request #1915 from tsigo/issue/1912
Fix rendered action for password change failure
Robert Speicher [Sun, 4 Nov 2012 21:47:37 +0000 (16:47 -0500)]
Fix rendered action for password change failure
Closes #1912
randx [Sun, 4 Nov 2012 21:44:58 +0000 (23:44 +0200)]
remove accidently created file
randx [Sun, 4 Nov 2012 21:43:33 +0000 (23:43 +0200)]
Decouple and refactor GraphCommit
Robert Speicher [Sun, 4 Nov 2012 21:29:44 +0000 (16:29 -0500)]
Fix double icon on header button hover
Dmitriy Zaporozhets [Fri, 2 Nov 2012 10:46:27 +0000 (03:46 -0700)]
Merge pull request #1902 from tsigo/breadcrumbs
Fix breadcrumb links on Commits page
Dmitriy Zaporozhets [Fri, 2 Nov 2012 10:44:39 +0000 (03:44 -0700)]
Merge pull request #1901 from tsigo/quiet_assets_gem
Add quiet_assets gem, remove initializer
Riyad Preukschas [Thu, 1 Nov 2012 22:34:16 +0000 (23:34 +0100)]
Fix source for iframe on Resque admin page
Robert Speicher [Thu, 1 Nov 2012 21:58:13 +0000 (17:58 -0400)]
Add 'breadcrumbs' helper for Commit breadcrumb links
Closes #1731
Robert Speicher [Thu, 1 Nov 2012 21:57:44 +0000 (17:57 -0400)]
Add Spinach feature for Commit breadcrumbs
Robert Speicher [Thu, 1 Nov 2012 21:57:12 +0000 (17:57 -0400)]
Don't initialize Tree History unless tree-slider is present
This was breaking breadcrumb links on non-Tree pages
Robert Speicher [Thu, 1 Nov 2012 21:56:39 +0000 (17:56 -0400)]
Remove "remote" attribute from Tree breadcrumb links
See https://github.com/gitlabhq/gitlabhq/pull/1665#discussion_r1804447
Robert Speicher [Thu, 1 Nov 2012 20:45:31 +0000 (16:45 -0400)]
Add quiet_assets gem, remove initializer
Dmitriy Zaporozhets [Wed, 31 Oct 2012 13:22:13 +0000 (15:22 +0200)]
Fix tests fail cause of issue with grit stub
Dmitriy Zaporozhets [Wed, 31 Oct 2012 12:39:05 +0000 (14:39 +0200)]
Init Roadmap
Dmitriy Zaporozhets [Wed, 31 Oct 2012 12:29:42 +0000 (14:29 +0200)]
Fix 404 errors on Merge Request -> new
Dmitriy Zaporozhets [Wed, 31 Oct 2012 11:53:38 +0000 (13:53 +0200)]
Update Gemfile with 1.9 syntax. Define ref for forks
Dmitriy Zaporozhets [Tue, 30 Oct 2012 12:01:21 +0000 (05:01 -0700)]
Merge pull request #1872 from mktums/patch-1
Update doc/install/databases.md
Mike TUMS [Tue, 30 Oct 2012 11:58:10 +0000 (15:58 +0400)]
Update doc/install/databases.md
Update docs for PostgreSQL installation
Dmitriy Zaporozhets [Tue, 30 Oct 2012 11:35:57 +0000 (13:35 +0200)]
Fix invalid template path for huge commit
Dmitriy Zaporozhets [Tue, 30 Oct 2012 11:27:15 +0000 (13:27 +0200)]
Project path validation: array of not allowed paths
Dmitriy Zaporozhets [Tue, 30 Oct 2012 11:04:56 +0000 (13:04 +0200)]
Added bare import script. Removed old unworking script
randx [Tue, 30 Oct 2012 08:03:21 +0000 (10:03 +0200)]
More seeds
randx [Tue, 30 Oct 2012 07:22:24 +0000 (09:22 +0200)]
Refactor milestones related functionality. Added seeds for Milestine and MR
Valeriy Sizov [Mon, 29 Oct 2012 22:32:32 +0000 (00:32 +0200)]
Update app/views/profile/account.html.haml
TYPO #1870
Valeriy Sizov [Mon, 29 Oct 2012 22:29:13 +0000 (00:29 +0200)]
Update app/views/shared/_no_ssh.html.haml
TYPO
randx [Mon, 29 Oct 2012 21:50:35 +0000 (23:50 +0200)]
Fix merge request count for milestone index
randx [Mon, 29 Oct 2012 21:46:46 +0000 (23:46 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
randx [Mon, 29 Oct 2012 21:45:21 +0000 (23:45 +0200)]
Merge branch 'piffio-public_submission_milestones_for_mr'
randx [Mon, 29 Oct 2012 21:45:11 +0000 (23:45 +0200)]
Finalize milestones for Merge Requests
Riyad Preukschas [Mon, 29 Oct 2012 20:51:28 +0000 (21:51 +0100)]
Fix no SSH key warning
randx [Mon, 29 Oct 2012 20:40:00 +0000 (22:40 +0200)]
Improve styles. Add merge request completness to milestone percentage
randx [Mon, 29 Oct 2012 19:37:46 +0000 (21:37 +0200)]
Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr
Conflicts:
app/views/merge_requests/_form.html.haml
Dmitriy Zaporozhets [Mon, 29 Oct 2012 11:12:26 +0000 (04:12 -0700)]
Merge pull request #1818 from riyad/refactor-satellite-actions
Refactor Satellite Code
Sergio Visinoni [Sun, 28 Oct 2012 08:22:03 +0000 (09:22 +0100)]
Show Milestone information in MR Listing
When a MR belongs to a Milestone, show this information in the listing
with a small box telling the Milestone title.
Dmitriy Zaporozhets [Sat, 27 Oct 2012 19:22:57 +0000 (12:22 -0700)]
Merge pull request #1851 from riyad/link-to-commit-authors-everywhere
Link to commit authors everywhere
Dmitriy Zaporozhets [Sat, 27 Oct 2012 19:21:03 +0000 (12:21 -0700)]
Merge pull request #1848 from seesaw/repos_symlinked
gitolite's repositories folder symlinked patch
Riyad Preukschas [Wed, 17 Oct 2012 22:49:20 +0000 (00:49 +0200)]
Fix styles
Riyad Preukschas [Sat, 27 Oct 2012 16:27:47 +0000 (18:27 +0200)]
Use #author_link for blame, commits and tree
Riyad Preukschas [Sat, 27 Oct 2012 16:15:00 +0000 (18:15 +0200)]
Generalize CommitDecorator#author_link to #person_link
Riyad Preukschas [Sat, 27 Oct 2012 15:35:15 +0000 (17:35 +0200)]
Make new/edit issue forms use containers on the page instead of adding their own
Fixes #1830
Riyad Preukschas [Sat, 27 Oct 2012 15:00:51 +0000 (17:00 +0200)]
Enable/disable from buttons on all input events (not just key events)
Fixes #1836
Michele Franzin [Sat, 27 Oct 2012 14:12:01 +0000 (16:12 +0200)]
gitolite's repositories folder symlinked patch
randx [Sat, 27 Oct 2012 08:28:08 +0000 (11:28 +0300)]
Merge branch 'NARKOZ-front-end'
randx [Sat, 27 Oct 2012 08:24:11 +0000 (11:24 +0300)]
Merge branch 'front-end' of https://github.com/NARKOZ/gitlabhq into NARKOZ-front-end
Conflicts:
app/views/issues/_form.html.haml
Dmitriy Zaporozhets [Sat, 27 Oct 2012 08:22:02 +0000 (01:22 -0700)]
Merge pull request #1841 from sectioneight/fix-postgres-documentation
Fix PostgreSQL setup instructions
Aiden Scandella [Fri, 26 Oct 2012 21:05:20 +0000 (14:05 -0700)]
Fix PostgreSQL setup instructions
The config skeleton for postgres is called `database.yml.postgresql`,
not `database.yml.postgres`.
randx [Fri, 26 Oct 2012 19:10:17 +0000 (22:10 +0300)]
we dont show commit message on tags page any more