OSDN Git Service
Sato Hiroyuki [Tue, 19 Mar 2013 03:53:12 +0000 (12:53 +0900)]
Fix travis failed randomly by timeout.
Sato Hiroyuki [Tue, 19 Mar 2013 01:22:55 +0000 (10:22 +0900)]
Fix timeout error while showing the very large repo like git repo.
Sato Hiroyuki [Tue, 19 Mar 2013 01:00:29 +0000 (10:00 +0900)]
Refactor: removing duplicate code.
Dmitriy Zaporozhets [Mon, 18 Mar 2013 21:44:57 +0000 (23:44 +0200)]
fixed check for snippets module enabled
Dmitriy Zaporozhets [Mon, 18 Mar 2013 21:38:16 +0000 (23:38 +0200)]
reorder features list in project -> edit page
Dmitriy Zaporozhets [Mon, 18 Mar 2013 21:33:41 +0000 (23:33 +0200)]
Move snippets to own tab as feature. Make it disabled for new projects by default
Dmitriy Zaporozhets [Mon, 18 Mar 2013 21:08:54 +0000 (23:08 +0200)]
feature: wiki -> new page
Dmitriy Zaporozhets [Mon, 18 Mar 2013 20:43:14 +0000 (22:43 +0200)]
Return own tab for wall. Improve Wiki nav. Removed attachments listing page
Dmitriy Zaporozhets [Mon, 18 Mar 2013 18:50:41 +0000 (20:50 +0200)]
Improve usability of project edit page
Dmitriy Zaporozhets [Mon, 18 Mar 2013 17:35:27 +0000 (19:35 +0200)]
Rename project_head partial to settings_nav
Dmitriy Zaporozhets [Mon, 18 Mar 2013 17:22:15 +0000 (19:22 +0200)]
show project description in project listing on dashboard
Dmitriy Zaporozhets [Mon, 18 Mar 2013 11:22:41 +0000 (13:22 +0200)]
Fix project_limit being ignored on signup
Dmitriy Zaporozhets [Mon, 18 Mar 2013 10:39:51 +0000 (03:39 -0700)]
Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests
Fix failure of cheking a merge request after conflict.
Dmitriy Zaporozhets [Mon, 18 Mar 2013 10:37:37 +0000 (03:37 -0700)]
Merge pull request #3243 from lyda/misspellings
Result of misspellings run.
Kevin Lyda [Sun, 17 Mar 2013 19:46:54 +0000 (19:46 +0000)]
Result of misspellings run.
Most of these are comments but a few are strings for users.
Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check
It runs mostly clean now.
murank [Sun, 17 Mar 2013 14:50:20 +0000 (23:50 +0900)]
Fix the order of clearing a satellite
Dmitriy Zaporozhets [Sun, 17 Mar 2013 11:48:27 +0000 (04:48 -0700)]
Merge pull request #3240 from DanKnox/fix_wiki_migrator
Fix Wiki migration task and add more test coverage.
Dan Knox [Sun, 17 Mar 2013 01:01:48 +0000 (18:01 -0700)]
Fix Wiki migration task and add more test coverage.
There was an error in the #extract_attributes_from_page method that
caused an exception when checking to see if a page named "Home"
already exists.
The check occurs to handle the renaming of the main index page to
"Home" to match the Gollum standard. If there is already a page
called "Home" then the migrator will leave that page and create
the Index page as usual. Users will need to manually rename their
old "Home" page to something else then rename their "Index" page
to "Home". Fortunately, I would be highly surprised if this case
ever comes up.
I also added more verbosity to the logging so if an error does
occur, it will be easier to track down which Wiki page is causing
the problem.
Dmitriy Zaporozhets [Sat, 16 Mar 2013 12:40:16 +0000 (14:40 +0200)]
Show projet name with namespace on team _projects widget
Dmitriy Zaporozhets [Sat, 16 Mar 2013 09:26:01 +0000 (02:26 -0700)]
Merge pull request #3217 from chrislawlor/2437
Adds DB-sensitive tablename escape for backup task.
Dmitriy Zaporozhets [Fri, 15 Mar 2013 16:50:45 +0000 (18:50 +0200)]
Gemfile.lock with gollum
Dmitriy Zaporozhets [Fri, 15 Mar 2013 16:46:23 +0000 (09:46 -0700)]
Merge pull request #3230 from DanKnox/update_gollum_repo_location
Update gollum repository location in the Gemfile.
Sytse Sijbrandij [Fri, 15 Mar 2013 16:33:43 +0000 (17:33 +0100)]
Update links to GitLab.com after renaming of GitLab cloud.
Dan Knox [Fri, 15 Mar 2013 16:05:02 +0000 (09:05 -0700)]
Update gollum repository location in the Gemfile.
Github just moved the Gollum repository to it's own organization.
This commit updates the Gemfile to point to the new repo location.
I also added a specific ref pointer to a version that is known to
work well just in case they slip up and break their master branch
right at the same time someone happens to be installing or updating
Gitlab. This is about the safest we can get until they put out the
next release that resolves the Pygments dependency issue.
Dmitriy Zaporozhets [Fri, 15 Mar 2013 16:01:03 +0000 (18:01 +0200)]
version up to beta1
Dmitriy Zaporozhets [Fri, 15 Mar 2013 15:35:54 +0000 (17:35 +0200)]
remove separator between search & icons in header
Dmitriy Zaporozhets [Fri, 15 Mar 2013 15:21:13 +0000 (17:21 +0200)]
Merge branch 'DanKnox-use_gollum_wikis'
Dmitriy Zaporozhets [Fri, 15 Mar 2013 15:21:01 +0000 (17:21 +0200)]
few fixes afte merge gollum wiki
Dmitriy Zaporozhets [Fri, 15 Mar 2013 14:55:07 +0000 (16:55 +0200)]
Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis
Conflicts:
app/views/layouts/project_resource.html.haml
app/views/wikis/edit.html.haml
app/views/wikis/pages.html.haml
app/views/wikis/show.html.haml
spec/features/gitlab_flavored_markdown_spec.rb
Dmitriy Zaporozhets [Fri, 15 Mar 2013 14:20:40 +0000 (16:20 +0200)]
Fix highlight line for solarized theme
Dmitriy Zaporozhets [Fri, 15 Mar 2013 14:05:07 +0000 (16:05 +0200)]
spianch -> profile -> specify within block
Dmitriy Zaporozhets [Fri, 15 Mar 2013 13:39:47 +0000 (15:39 +0200)]
restyle header a bit
Dmitriy Zaporozhets [Fri, 15 Mar 2013 13:16:02 +0000 (15:16 +0200)]
reannotated
Dmitriy Zaporozhets [Fri, 15 Mar 2013 13:14:56 +0000 (15:14 +0200)]
finish up with solarized dark
Dmitriy Zaporozhets [Fri, 15 Mar 2013 13:09:34 +0000 (15:09 +0200)]
add dark solarized theme for code preview
Dmitriy Zaporozhets [Fri, 15 Mar 2013 12:22:49 +0000 (14:22 +0200)]
Merge branch 'feature/writeboard'
Dmitriy Zaporozhets [Fri, 15 Mar 2013 12:20:03 +0000 (14:20 +0200)]
Use wiki tab for wiki, wall, snippets
Dmitriy Zaporozhets [Fri, 15 Mar 2013 07:39:50 +0000 (09:39 +0200)]
on wall subpage active tab should be wiki too
Dmitriy Zaporozhets [Fri, 15 Mar 2013 07:39:07 +0000 (09:39 +0200)]
rename writeboards to wiki
Dmitriy Zaporozhets [Thu, 14 Mar 2013 20:57:38 +0000 (22:57 +0200)]
add resize button for better wiki reading
Dmitriy Zaporozhets [Thu, 14 Mar 2013 20:24:27 +0000 (22:24 +0200)]
Merge wiki, wall & snippets under one tab - writeboards
Dmitriy Zaporozhets [Thu, 14 Mar 2013 19:51:44 +0000 (21:51 +0200)]
Change spinach tab tests to fit new tabs navigation
Dmitriy Zaporozhets [Thu, 14 Mar 2013 17:50:57 +0000 (19:50 +0200)]
Remove tree single-tab panel
Chris Lawlor [Thu, 14 Mar 2013 15:40:09 +0000 (11:40 -0400)]
Adds DB-sensitive tablename escape for backup task.
Uses ActiveRecord::Base.connection.quote_table_name.
Fixes issue 2437.
Dmitriy Zaporozhets [Thu, 14 Mar 2013 17:28:29 +0000 (19:28 +0200)]
Add settings tab to project. Move all project administration there
Dmitriy Zaporozhets [Thu, 14 Mar 2013 15:13:00 +0000 (17:13 +0200)]
Fix spinach tests
Dmitriy Zaporozhets [Thu, 14 Mar 2013 12:02:56 +0000 (14:02 +0200)]
removed mistype
Dmitriy Zaporozhets [Thu, 14 Mar 2013 12:02:24 +0000 (14:02 +0200)]
use refresh icon instead loader gif
Dmitriy Zaporozhets [Thu, 14 Mar 2013 11:12:11 +0000 (13:12 +0200)]
Replace projects_box with ui-box. Fixed team spinach test
Dmitriy Zaporozhets [Thu, 14 Mar 2013 11:11:20 +0000 (13:11 +0200)]
Redesign search filters
Dmitriy Zaporozhets [Thu, 14 Mar 2013 10:43:08 +0000 (12:43 +0200)]
add teams to search autocomplete
Dmitriy Zaporozhets [Thu, 14 Mar 2013 10:38:43 +0000 (12:38 +0200)]
Rebuild team area
Dmitriy Zaporozhets [Thu, 14 Mar 2013 10:37:28 +0000 (12:37 +0200)]
Remove separate search page from group
Dmitriy Zaporozhets [Thu, 14 Mar 2013 09:31:33 +0000 (11:31 +0200)]
Restyled group -> edit area. Use select2 for transfer autocomplete
Dmitriy Zaporozhets [Thu, 14 Mar 2013 08:20:45 +0000 (10:20 +0200)]
style select2-searching too
Dmitriy Zaporozhets [Thu, 14 Mar 2013 08:20:25 +0000 (10:20 +0200)]
Merge branch 'feature/select2-user-ajax'
Dmitriy Zaporozhets [Thu, 14 Mar 2013 08:16:27 +0000 (10:16 +0200)]
Finish select2-ajax for users. Added Select2Helper for tests
Dan Knox [Thu, 14 Mar 2013 07:07:01 +0000 (00:07 -0700)]
Fix whitespace on MARKUPS constant in GollumWiki class.
Dan Knox [Thu, 14 Mar 2013 06:34:50 +0000 (23:34 -0700)]
Limit available Wiki formats to Markdown and RDoc.
Dan Knox [Thu, 14 Mar 2013 06:31:08 +0000 (23:31 -0700)]
Use Gitlab Markdown for Markdown files and Gollum to render the rest.
This commit enables the usage of the Gitlab Markdown post processing
on all Markdown formatted files. For file types that do not contain
Markdown, it defaults to the Gollum native renderer to process the
content.
Dmitriy Zaporozhets [Wed, 13 Mar 2013 21:45:47 +0000 (23:45 +0200)]
fix setting gon.api_token
Dmitriy Zaporozhets [Wed, 13 Mar 2013 20:32:04 +0000 (22:32 +0200)]
Allow single/multiple user select
Dmitriy Zaporozhets [Wed, 13 Mar 2013 19:42:14 +0000 (21:42 +0200)]
multiselect for ajax-users-select2
Dmitriy Zaporozhets [Wed, 13 Mar 2013 19:37:50 +0000 (21:37 +0200)]
add api users filter and integrate users select2
Dmitriy Zaporozhets [Wed, 13 Mar 2013 19:37:13 +0000 (21:37 +0200)]
user select2 javascript
Dmitriy Zaporozhets [Wed, 13 Mar 2013 19:36:53 +0000 (21:36 +0200)]
md5 and utf_encode js libraries
Dmitriy Zaporozhets [Wed, 13 Mar 2013 19:36:26 +0000 (21:36 +0200)]
select2-rails gem added
Dmitriy Zaporozhets [Wed, 13 Mar 2013 21:15:39 +0000 (23:15 +0200)]
show mail-to and block buttons on /admin/users/:id page
Dmitriy Zaporozhets [Wed, 13 Mar 2013 20:30:33 +0000 (22:30 +0200)]
UserTeam spinach fixed
Dmitriy Zaporozhets [Wed, 13 Mar 2013 19:58:32 +0000 (21:58 +0200)]
Fix spinach tests
Dmitriy Zaporozhets [Wed, 13 Mar 2013 17:24:30 +0000 (19:24 +0200)]
Use name+username in team -> new
Dmitriy Zaporozhets [Wed, 13 Mar 2013 17:16:36 +0000 (19:16 +0200)]
Remove team_member show page -> use user_path instead
Dmitriy Zaporozhets [Tue, 12 Mar 2013 16:59:25 +0000 (18:59 +0200)]
stub git shell mv_repository
Dmitriy Zaporozhets [Tue, 12 Mar 2013 12:16:55 +0000 (14:16 +0200)]
ask users to use ruby 1.9.3 for now
Dmitriy Zaporozhets [Tue, 12 Mar 2013 12:13:25 +0000 (14:13 +0200)]
cleanup ProjectMover
Dmitriy Zaporozhets [Tue, 12 Mar 2013 12:10:20 +0000 (14:10 +0200)]
fix spinach after #3196
Dmitriy Zaporozhets [Tue, 12 Mar 2013 11:31:57 +0000 (04:31 -0700)]
Merge pull request #3196 from Undev/feature/broken-projects-search-23049
Broken projects search on dashboard
Andrew8xx8 [Tue, 12 Mar 2013 11:15:14 +0000 (15:15 +0400)]
Tests for dashboard projects fixed
Dmitriy Zaporozhets [Tue, 12 Mar 2013 10:53:07 +0000 (12:53 +0200)]
check gitlab-shell version in gitlab:check
Dmitriy Zaporozhets [Tue, 12 Mar 2013 10:40:49 +0000 (12:40 +0200)]
fix project move email
Dmitriy Zaporozhets [Tue, 12 Mar 2013 10:37:53 +0000 (12:37 +0200)]
Use gitlab-shell to move repos. Requires gitlab-shell v1.1.0
Andrew8xx8 [Tue, 12 Mar 2013 09:40:54 +0000 (13:40 +0400)]
Tests improved
Andrew8xx8 [Tue, 12 Mar 2013 09:33:27 +0000 (13:33 +0400)]
Search fields were have same id's. Fixed
Andrew8xx8 [Tue, 12 Mar 2013 09:26:45 +0000 (13:26 +0400)]
Search projects on dashboard was not worked. Fixed
Dmitriy Zaporozhets [Tue, 12 Mar 2013 08:46:04 +0000 (10:46 +0200)]
restyle and cleanup emails
Dmitriy Zaporozhets [Mon, 11 Mar 2013 13:48:16 +0000 (06:48 -0700)]
Merge pull request #3192 from hiroponz/convert-to-coffee
Convert branch-graph.js to branch-graph.js.coffee
Dmitriy Zaporozhets [Mon, 11 Mar 2013 13:47:44 +0000 (15:47 +0200)]
fix api internal test
Sato Hiroyuki [Mon, 11 Mar 2013 08:52:27 +0000 (17:52 +0900)]
Covert to coffee.
Dmitriy Zaporozhets [Mon, 11 Mar 2013 12:35:00 +0000 (14:35 +0200)]
Reduce amount of user info provided with internal api
Sato Hiroyuki [Mon, 11 Mar 2013 07:40:58 +0000 (16:40 +0900)]
Rename to coffee.
Dmitriy Zaporozhets [Mon, 11 Mar 2013 06:56:29 +0000 (23:56 -0700)]
Merge pull request #3170 from Asquera/api/system_hooks_adjustments
API: system hook request functions and documentation updated
Dan Knox [Mon, 11 Mar 2013 02:10:44 +0000 (19:10 -0700)]
Create Wiki migration task.
This commit adds a new Rake task for migrating all of your existing
Wiki content from your database into new Gollum repositories.
The bulk of the logic happens within the `WikiToGollumMigrator`
class which is decently test covered and located in the lib directory.
The new Rake task can be executed by running:
`bundle exec rake gitlab:wiki:migrate`
It will output a nice log of every project that it migrates along
with success or failure messages.
I have used it on my own installation to migrate my Wikis successfully.
Dan Knox [Sun, 10 Mar 2013 21:37:26 +0000 (14:37 -0700)]
Add Spinach coverage for Gollum Wiki system and correct the Delete link.
The previously failing Spinach steps have been fixed with this commit.
I have also added new steps that cover the entire usage of the Wiki
system.
The new Spinach steps revealed a minor bug in the Delete page process.
The path for the "Delete this page" button was previously set to
`project_wikis_page(@project, @wiki)` when it should have been
using the singular `project_wiki_page(@project, @wiki)` path helper.
The link has been corrected and all steps are now passing.
Dmitriy Zaporozhets [Sun, 10 Mar 2013 18:29:34 +0000 (20:29 +0200)]
fixed travis env, added coverage badge
Dmitriy Zaporozhets [Sun, 10 Mar 2013 18:26:27 +0000 (20:26 +0200)]
add coveralls.io to travis builds
Dmitriy Zaporozhets [Sun, 10 Mar 2013 10:16:57 +0000 (12:16 +0200)]
Group and team rss is valid now
Dmitriy Zaporozhets [Sun, 10 Mar 2013 09:57:14 +0000 (11:57 +0200)]
Move groups and teams to tabs on dashboard. Remember tab with cookie
Dmitriy Zaporozhets [Sun, 10 Mar 2013 09:00:14 +0000 (01:00 -0800)]
Merge pull request #3169 from hiroponz/refactor-network-graph
Refactor network graph
Dan Knox [Mon, 4 Mar 2013 03:43:52 +0000 (19:43 -0800)]
Replace current Wiki system with Gollum Wikis.
This commit replaces the old database backed Wiki system with the
excellent Gollum git based Wiki system.
The UI has been updated to allow for utilizing the extra features
that Gollum provides. Specifically:
* Edit page now allows you to choose the content format.
* Edit page allows you to provide a commit message for the change.
* History page now shows Format, Commit Message, and Commit Hash.
* A new Git Access page has been added with the Wiki Repo URL.
* The default page has been changed to Home from Index to match
the Gollum standard.
The old Wiki model has been left in tact to provide for the
development of a migration script that will move all content stored
in the old Wiki system into new Gollum Wikis.
Dmitriy Zaporozhets [Sat, 9 Mar 2013 22:12:25 +0000 (00:12 +0200)]
better logo images for header