OSDN Git Service

wvm/gitlab.git
11 years ago"Cant" -> "Can't"
Robert Speicher [Fri, 10 Aug 2012 23:47:54 +0000 (19:47 -0400)]
"Cant" -> "Can't"

11 years agoModern theme restyled. Better Profile -> Ui page
Dmitriy Zaporozhets [Mon, 13 Aug 2012 05:52:10 +0000 (08:52 +0300)]
Modern theme restyled. Better Profile -> Ui page

11 years agorspec to capybara-webkit. simplercov now use cucumber
Dmitriy Zaporozhets [Mon, 13 Aug 2012 05:32:10 +0000 (08:32 +0300)]
rspec to capybara-webkit. simplercov now use cucumber

11 years agoTemporary remove sqlite from travis
randx [Sat, 11 Aug 2012 21:36:43 +0000 (00:36 +0300)]
Temporary remove sqlite from travis

11 years agoMerge branch 'jouve-fix_commits_dashboard'
randx [Sat, 11 Aug 2012 21:34:14 +0000 (00:34 +0300)]
Merge branch 'jouve-fix_commits_dashboard'

11 years agoMerge pull request #1224 from tsigo/omniauth_sample_syntax
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

11 years agoFix 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

11 years agoMerge branch 'fix_commits_dashboard' of https://github.com/jouve/gitlabhq into jouve...
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

11 years agoSwitch to capybara-webkit for Cucumber
randx [Sat, 11 Aug 2012 20:33:49 +0000 (23:33 +0300)]
Switch to capybara-webkit for Cucumber

11 years agoTrying to prevent travis broken builds by increase capybara timout 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

11 years agoAdd comments to Gemfile
randx [Sat, 11 Aug 2012 19:59:56 +0000 (22:59 +0300)]
Add comments to Gemfile

11 years agoRails version to 3.2.8
randx [Sat, 11 Aug 2012 19:48:55 +0000 (22:48 +0300)]
Rails version to 3.2.8

11 years agoMerge pull request #1166 from three18ti/master
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

11 years agoHandle app crash on huge commits
randx [Sat, 11 Aug 2012 12:59:36 +0000 (15:59 +0300)]
Handle app crash on huge commits

11 years agoMerge pull request #1219 from tsigo/ruby19_hashes
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

11 years agoRevert 1.9 Hash syntax in ValidCommit::BLOB_FILE
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.

11 years agoFully embrace Ruby 1.9 hash syntax
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/

11 years agofix commit events on dashboard
Cyril [Fri, 10 Aug 2012 19:23:54 +0000 (21:23 +0200)]
fix commit events on dashboard

11 years agoMerge pull request #1208 from tsigo/issue_commonality
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

11 years agoMerge pull request #1198 from NARKOZ/preview_notes
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

11 years agoMerge pull request #984 from abevoelker/fix-init.d-resque
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

11 years agorender notes preview on server-side
Nihad Abbasov [Wed, 8 Aug 2012 09:25:24 +0000 (02:25 -0700)]
render notes preview on server-side

11 years agoFix `search` class method for IssueCommonality
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.

11 years agoConsolidate functionality shared between Issue and MergeRequest
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.

11 years agoAdd empty IssueCommonality module; include in Issue and MergeRequest
Robert Speicher [Thu, 9 Aug 2012 01:26:56 +0000 (21:26 -0400)]
Add empty IssueCommonality module; include in Issue and MergeRequest

11 years agoWiki pages page
Dmitriy Zaporozhets [Thu, 9 Aug 2012 04:34:29 +0000 (07:34 +0300)]
Wiki pages page

11 years agoslim comment form
Dmitriy Zaporozhets [Thu, 9 Aug 2012 03:36:55 +0000 (06:36 +0300)]
slim comment form

11 years agoFixed gfm mailer
Dmitriy Zaporozhets [Thu, 9 Aug 2012 03:02:55 +0000 (06:02 +0300)]
Fixed gfm mailer

11 years agoFix github issue #1153
randx [Wed, 8 Aug 2012 14:08:43 +0000 (17:08 +0300)]
Fix github issue #1153

11 years agoCucumber feature -> Merge Request
Dmitriy Zaporozhets [Thu, 9 Aug 2012 05:13:29 +0000 (08:13 +0300)]
Cucumber feature -> Merge Request

11 years agoVersion to 2.8.0pre
Dmitriy Zaporozhets [Fri, 10 Aug 2012 07:49:45 +0000 (10:49 +0300)]
Version to 2.8.0pre

11 years agoFixed markdown tests
randx [Wed, 8 Aug 2012 08:52:09 +0000 (11:52 +0300)]
Fixed markdown tests

11 years agoability to preview notes
Nihad Abbasov [Tue, 7 Aug 2012 13:17:29 +0000 (06:17 -0700)]
ability to preview notes

11 years agoFixed dashboard broken messages cause of glm
randx [Fri, 3 Aug 2012 00:28:02 +0000 (03:28 +0300)]
Fixed dashboard broken messages cause of glm

11 years agoGitlab Markdown help page
randx [Thu, 2 Aug 2012 21:20:09 +0000 (00:20 +0300)]
Gitlab Markdown help page

11 years agoMerge pull request #1183 from riyad/gitlab-flavored-markdown
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

11 years agoUpdate notifications mails and notify specs for GFM
Riyad Preukschas [Mon, 6 Aug 2012 03:08:22 +0000 (05:08 +0200)]
Update notifications mails and notify specs for GFM

11 years agoFix missing @project errors
Riyad Preukschas [Mon, 6 Aug 2012 01:16:06 +0000 (03:16 +0200)]
Fix missing @project errors

11 years agoFix GFM helper to raise an exception when @project is not set
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

11 years agoFix GFM specs for ids in markdown headings
Riyad Preukschas [Mon, 6 Aug 2012 00:31:16 +0000 (02:31 +0200)]
Fix GFM specs for ids in markdown headings

11 years agoMerge branch 'master' into gitlab-flavored-markdown
Riyad Preukschas [Sun, 5 Aug 2012 23:48:20 +0000 (01:48 +0200)]
Merge branch 'master' into gitlab-flavored-markdown

11 years agoAdd admin credentials to installation docs
randx [Thu, 2 Aug 2012 12:30:22 +0000 (15:30 +0300)]
Add admin credentials to installation docs

11 years agoMerge pull request #1147 from miks/master
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

11 years agoMerge pull request #1184 from karuna/master
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

11 years agoRack mini profiler for dev env
randx [Thu, 2 Aug 2012 06:48:24 +0000 (09:48 +0300)]
Rack mini profiler for dev env

11 years agoFix travis script
randx [Sat, 4 Aug 2012 07:13:54 +0000 (10:13 +0300)]
Fix travis script

11 years agoFix github issue #1190
randx [Thu, 2 Aug 2012 06:07:01 +0000 (09:07 +0300)]
Fix github issue #1190

11 years agoRemove useless Protected branch test
randx [Thu, 2 Aug 2012 06:05:00 +0000 (09:05 +0300)]
Remove useless Protected branch test

11 years agoMerge branch 'tests_cleanup' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Sat, 4 Aug 2012 06:47:58 +0000 (06:47 +0000)]
Merge branch 'tests_cleanup' of dev.gitlabhq.com:gitlabhq

11 years agoMerge pull request #1152 from natrim/master
Dmitriy Zaporozhets [Sat, 4 Aug 2012 06:27:31 +0000 (23:27 -0700)]
Merge pull request #1152 from natrim/master

Fix UMASK checking in .gitoliterc

11 years agoComments cucumber. More refactoring. Cucumber -> branches, tags
Dmitriy Zaporozhets [Fri, 3 Aug 2012 16:59:55 +0000 (19:59 +0300)]
Comments cucumber. More refactoring. Cucumber -> branches, tags

11 years agoIssues cucumber. refactored step_definitoons
Dmitriy Zaporozhets [Fri, 3 Aug 2012 16:49:54 +0000 (19:49 +0300)]
Issues cucumber. refactored step_definitoons

11 years agoMilestones cucumber. Renamed app security test
Dmitriy Zaporozhets [Fri, 3 Aug 2012 16:39:54 +0000 (19:39 +0300)]
Milestones cucumber. Renamed app security test

11 years agoRemove duplicate coverage in spec requests. All features should be covered in cucumber
Dmitriy Zaporozhets [Fri, 3 Aug 2012 16:29:54 +0000 (19:29 +0300)]
Remove duplicate coverage in spec requests. All features should be covered in cucumber

11 years agoMerge pull request #1179 from robbytaylor/master
Valeriy Sizov [Thu, 2 Aug 2012 16:27:10 +0000 (09:27 -0700)]
Merge pull request #1179 from robbytaylor/master

Grammar fix after creating a project

11 years agomake hooks respect http basic authentication
gitlab system [Thu, 2 Aug 2012 02:48:46 +0000 (09:48 +0700)]
make hooks respect http basic authentication

11 years agoUpdate views for GFM
Riyad Preukschas [Thu, 2 Aug 2012 00:31:45 +0000 (02:31 +0200)]
Update views for GFM

11 years agoAdd specs for using GFM on a variety pages
Riyad Preukschas [Thu, 2 Aug 2012 00:30:36 +0000 (02:30 +0200)]
Add specs for using GFM on a variety pages

11 years agoRemove the commit_msg_with_link_to_issues helper and specs
Riyad Preukschas [Thu, 2 Aug 2012 00:29:47 +0000 (02:29 +0200)]
Remove the commit_msg_with_link_to_issues helper and specs

11 years agoUpdate Gitlab Markdown renderer to use GFM
Riyad Preukschas [Thu, 2 Aug 2012 00:29:15 +0000 (02:29 +0200)]
Update Gitlab Markdown renderer to use GFM

11 years agoAdd link_to_gfm helper and specs
Riyad Preukschas [Thu, 2 Aug 2012 00:28:50 +0000 (02:28 +0200)]
Add link_to_gfm helper and specs

11 years agoAdd GFM helper
Riyad Preukschas [Thu, 2 Aug 2012 00:41:49 +0000 (02:41 +0200)]
Add GFM helper

11 years agoAdd GFM helper specs
Riyad Preukschas [Thu, 2 Aug 2012 00:26:21 +0000 (02:26 +0200)]
Add GFM helper specs

tests references to
* commits
* team members
* issues
* merge requests
* snipptes

11 years agoAdd render context to markdown renderer
Riyad Preukschas [Mon, 23 Jul 2012 23:45:08 +0000 (01:45 +0200)]
Add render context to markdown renderer

11 years agoAPI: set content type for raw snippet
Nihad Abbasov [Wed, 1 Aug 2012 12:57:56 +0000 (05:57 -0700)]
API: set content type for raw snippet

11 years agofix typo according to docs and tests
Nihad Abbasov [Wed, 1 Aug 2012 12:48:15 +0000 (05:48 -0700)]
fix typo according to docs and tests

11 years agoFixed grammar in 'please wait' message after creating project
Rob Taylor [Wed, 1 Aug 2012 10:19:20 +0000 (11:19 +0100)]
Fixed grammar in 'please wait' message after creating project

11 years agochanged install script and docs to use postfix instead of sendmail
three18ti [Mon, 30 Jul 2012 21:42:40 +0000 (15:42 -0600)]
changed install script and docs to use postfix instead of sendmail

11 years agoupdated ./resque.sh instruction to use sudo
three18ti [Mon, 30 Jul 2012 01:49:43 +0000 (19:49 -0600)]
updated ./resque.sh instruction to use sudo

11 years agoadded mysql configuration instructions
three18ti [Mon, 30 Jul 2012 01:47:28 +0000 (19:47 -0600)]
added mysql configuration instructions

11 years agoupdated ubuntu install script to include sendmail
three18ti [Mon, 30 Jul 2012 01:43:07 +0000 (19:43 -0600)]
updated ubuntu install script to include sendmail

11 years agoBetter cucumber coverage for dashboard
randx [Sun, 29 Jul 2012 17:22:48 +0000 (20:22 +0300)]
Better cucumber coverage for dashboard

11 years agoBetter name for Project push methods module
randx [Sun, 29 Jul 2012 17:08:58 +0000 (20:08 +0300)]
Better name for Project push methods module

11 years agoStyled Source Browse
randx [Sun, 29 Jul 2012 09:51:58 +0000 (12:51 +0300)]
Styled Source Browse

11 years agoTeam Member Profile: Remove button rebased
randx [Sat, 28 Jul 2012 22:40:21 +0000 (01:40 +0300)]
Team Member Profile: Remove button rebased

11 years agoCSS refactoring. Notes better styled
randx [Sat, 28 Jul 2012 22:34:51 +0000 (01:34 +0300)]
CSS refactoring. Notes better styled

11 years agoMerge pull request #1163 from tomykaira/bug_1009
Dmitriy Zaporozhets [Sat, 28 Jul 2012 14:46:40 +0000 (07:46 -0700)]
Merge pull request #1163 from tomykaira/bug_1009

Fix #1009 Replace all special characters in user's identity

11 years agoMerge pull request #983 from JamesEarlDouglas/notify-grammar
Dmitriy Zaporozhets [Sat, 28 Jul 2012 14:38:17 +0000 (07:38 -0700)]
Merge pull request #983 from JamesEarlDouglas/notify-grammar

cleanup the wording of the notification footer

11 years agoFix #1009 Replace all special characters in user's identity
tomykaira [Sat, 28 Jul 2012 12:59:30 +0000 (21:59 +0900)]
Fix #1009 Replace all special characters in user's identity

11 years agoFixed firefox css bug with issues table
randx [Sat, 28 Jul 2012 02:43:34 +0000 (05:43 +0300)]
Fixed firefox css bug with issues table

11 years agoFeature: Bulk Issues update
randx [Sat, 28 Jul 2012 00:35:24 +0000 (03:35 +0300)]
Feature: Bulk Issues update

11 years agoMerge pull request #1157 from CodeAdept/api_blob_contents
Nihad Abbasov [Wed, 1 Aug 2012 06:37:48 +0000 (23:37 -0700)]
Merge pull request #1157 from CodeAdept/api_blob_contents

API blob contents

11 years agofixed typo
Jeremy Anderson [Tue, 31 Jul 2012 14:34:06 +0000 (07:34 -0700)]
fixed typo

11 years agoupdating project api to include raw blob contents and single branch
Jeremy Anderson [Thu, 26 Jul 2012 14:29:53 +0000 (07:29 -0700)]
updating project api to include raw blob contents and single branch

11 years agoBackend Refactoring
Dmitriy Zaporozhets [Tue, 31 Jul 2012 05:32:49 +0000 (08:32 +0300)]
Backend Refactoring

11 years agoMerge remote-tracking branch 'upstream/master'
Jeremy Anderson [Sat, 28 Jul 2012 02:18:04 +0000 (22:18 -0400)]
Merge remote-tracking branch 'upstream/master'

11 years agoStyled New/Edit Project for admin area
randx [Fri, 27 Jul 2012 21:42:44 +0000 (00:42 +0300)]
Styled New/Edit Project for admin area

11 years agofix commits spec
randx [Fri, 27 Jul 2012 21:40:14 +0000 (00:40 +0300)]
fix commits spec

11 years agoBetter visibility of event commit links & commits ids
randx [Fri, 27 Jul 2012 21:27:54 +0000 (00:27 +0300)]
Better visibility of event commit links & commits ids

11 years agoFix issue padding cause PR 1144
randx [Fri, 27 Jul 2012 20:57:42 +0000 (23:57 +0300)]
Fix issue padding cause PR 1144

11 years agoMerge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased
Dmitriy Zaporozhets [Fri, 27 Jul 2012 20:48:05 +0000 (13:48 -0700)]
Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased

Break up links with nested formating (rebased)

11 years agoMerge pull request #1154 from meskyanichi/master
Dmitriy Zaporozhets [Fri, 27 Jul 2012 13:33:03 +0000 (06:33 -0700)]
Merge pull request #1154 from meskyanichi/master

As per request: Post-receive hook should be owned by gitlab user, not git.

11 years agoPost-receive hook should be owned by gitlab user, not git.
Michael van Rooijen [Fri, 27 Jul 2012 13:30:36 +0000 (15:30 +0200)]
Post-receive hook should be owned by gitlab user, not git.

11 years agofix checking for right gitolite UMASK
natrim [Fri, 27 Jul 2012 09:03:30 +0000 (12:03 +0300)]
fix checking for right gitolite UMASK

11 years agocommit.short_id as model method. Styled inline comment form
randx [Fri, 27 Jul 2012 08:22:05 +0000 (11:22 +0300)]
commit.short_id as model method. Styled inline comment form

11 years agoMerge pull request #1129 from meskyanichi/master
Dmitriy Zaporozhets [Fri, 27 Jul 2012 06:11:46 +0000 (23:11 -0700)]
Merge pull request #1129 from meskyanichi/master

Potential solution for current `rake gitlab:app:backup_restore` issues.

11 years agoModified the `repo_dump` and `repo_restore` rake tasks to properly dump and restore...
Michael van Rooijen [Sun, 22 Jul 2012 12:48:23 +0000 (14:48 +0200)]
Modified the `repo_dump` and `repo_restore` rake tasks to properly dump and restore repositories based on their `path` rather than their (project) `name`. The project name can be uppercase and may contain spaces. This caused the repository to be restored as a different `path` that it was initially created as, thus, breaking the `git remote` and the web interface can no longer detect the repository either because it searches by `path` and not by `name`. Also, when restoring the permissions are incorrect making it impossible to push new commits to the remote repository. So now on success it'll set the correct permissions (but requires that the `gitlab` user has `sudo` privileges, or this task must be executed as root).

11 years agoFixed persmission issue in doc. Added validation of hooks in gitlab:app:status
randx [Thu, 26 Jul 2012 13:14:34 +0000 (16:14 +0300)]
Fixed persmission issue in doc. Added validation of hooks in gitlab:app:status

11 years agoFixed dashboard loader, fixed 404 for reporter on empty wiki page.
randx [Thu, 26 Jul 2012 11:45:17 +0000 (14:45 +0300)]
Fixed dashboard loader, fixed 404 for reporter on empty wiki page.
Styled Wiki edit page

11 years agoAdd automatic HTML id attributes to markdown headings to allow linking
miks [Thu, 26 Jul 2012 08:47:17 +0000 (11:47 +0300)]
Add automatic HTML id attributes to markdown headings to allow linking
to content sections in wiki