OSDN Git Service

wvm/gitlab.git
11 years agoDisplay icon and commit message on network graph.
Sato Hiroyuki [Wed, 20 Mar 2013 09:19:01 +0000 (09:19 +0000)]
Display icon and commit message on network graph.

11 years agoRefactor: clean up code.
Sato Hiroyuki [Thu, 21 Mar 2013 12:34:15 +0000 (12:34 +0000)]
Refactor: clean up code.

11 years agoRotating graph orientation.
Sato Hiroyuki [Wed, 20 Mar 2013 09:17:12 +0000 (09:17 +0000)]
Rotating graph orientation.

11 years agoChange graph element size.
Sato Hiroyuki [Tue, 19 Mar 2013 10:27:15 +0000 (19:27 +0900)]
Change graph element size.

11 years agoRefactor: extract method.
Sato Hiroyuki [Tue, 19 Mar 2013 09:42:46 +0000 (18:42 +0900)]
Refactor: extract method.

11 years agoRefactor: Clean up code.
Sato Hiroyuki [Tue, 19 Mar 2013 09:08:27 +0000 (18:08 +0900)]
Refactor: Clean up code.

11 years agoMerge pull request #3251 from AlexDenisov/api_additional_user_fields
Dmitriy Zaporozhets [Tue, 19 Mar 2013 06:20:11 +0000 (23:20 -0700)]
Merge pull request #3251 from AlexDenisov/api_additional_user_fields

Abilities added to /user and /sign_in requests

11 years agoMerge pull request #3252 from hiroponz/fix-timeout-large-repository
Dmitriy Zaporozhets [Tue, 19 Mar 2013 06:17:52 +0000 (23:17 -0700)]
Merge pull request #3252 from hiroponz/fix-timeout-large-repository

Fix timeout error while showing the network graph.

11 years agoFix spec errors.
Sato Hiroyuki [Tue, 19 Mar 2013 04:46:07 +0000 (13:46 +0900)]
Fix spec errors.

11 years agoAPI docs updated
Alex Denisov [Mon, 18 Mar 2013 21:06:24 +0000 (21:06 +0000)]
API docs updated

11 years agoFix travis failed randomly by timeout.
Sato Hiroyuki [Tue, 19 Mar 2013 03:53:12 +0000 (12:53 +0900)]
Fix travis failed randomly by timeout.

11 years agoFix timeout error while showing the very large repo like git repo.
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.

11 years agoRefactor: removing duplicate code.
Sato Hiroyuki [Tue, 19 Mar 2013 01:00:29 +0000 (10:00 +0900)]
Refactor: removing duplicate code.

11 years agofixed check for snippets module enabled
Dmitriy Zaporozhets [Mon, 18 Mar 2013 21:44:57 +0000 (23:44 +0200)]
fixed check for snippets module enabled

11 years agoreorder features list in project -> edit page
Dmitriy Zaporozhets [Mon, 18 Mar 2013 21:38:16 +0000 (23:38 +0200)]
reorder features list in project -> edit page

11 years agoMove snippets to own tab as feature. Make it disabled for new projects by default
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

11 years agofeature: wiki -> new page
Dmitriy Zaporozhets [Mon, 18 Mar 2013 21:08:54 +0000 (23:08 +0200)]
feature: wiki -> new page

11 years agoReturn own tab for wall. Improve Wiki nav. Removed attachments listing 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

11 years agoAbilities added to /user and /sign_in requests
Alex Denisov [Mon, 18 Mar 2013 20:11:28 +0000 (20:11 +0000)]
Abilities added to /user and /sign_in requests

11 years agoImprove usability of project edit page
Dmitriy Zaporozhets [Mon, 18 Mar 2013 18:50:41 +0000 (20:50 +0200)]
Improve usability of project edit page

11 years agoRename project_head partial to settings_nav
Dmitriy Zaporozhets [Mon, 18 Mar 2013 17:35:27 +0000 (19:35 +0200)]
Rename project_head partial to settings_nav

11 years agoshow project description in project listing on dashboard
Dmitriy Zaporozhets [Mon, 18 Mar 2013 17:22:15 +0000 (19:22 +0200)]
show project description in project listing on dashboard

11 years agoFix project_limit being ignored on signup
Dmitriy Zaporozhets [Mon, 18 Mar 2013 11:22:41 +0000 (13:22 +0200)]
Fix project_limit being ignored on signup

11 years agoMerge pull request #3242 from murank/fix_failure_of_checking_merge_requests
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.

11 years agoMerge pull request #3243 from lyda/misspellings
Dmitriy Zaporozhets [Mon, 18 Mar 2013 10:37:37 +0000 (03:37 -0700)]
Merge pull request #3243 from lyda/misspellings

Result of misspellings run.

11 years agoResult 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.

11 years agoFix the order of clearing a satellite
murank [Sun, 17 Mar 2013 14:50:20 +0000 (23:50 +0900)]
Fix the order of clearing a satellite

11 years agoMerge pull request #3240 from DanKnox/fix_wiki_migrator
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.

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

11 years agoShow projet name with namespace on team _projects widget
Dmitriy Zaporozhets [Sat, 16 Mar 2013 12:40:16 +0000 (14:40 +0200)]
Show projet name with namespace on team _projects widget

11 years agoMerge pull request #3217 from chrislawlor/2437
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.

11 years agoGemfile.lock with gollum
Dmitriy Zaporozhets [Fri, 15 Mar 2013 16:50:45 +0000 (18:50 +0200)]
Gemfile.lock with gollum

11 years agoMerge pull request #3230 from DanKnox/update_gollum_repo_location
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.

11 years agoUpdate links to GitLab.com after renaming of GitLab cloud.
Sytse Sijbrandij [Fri, 15 Mar 2013 16:33:43 +0000 (17:33 +0100)]
Update links to GitLab.com after renaming of GitLab cloud.

11 years agoUpdate gollum repository location in the Gemfile.
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.

11 years agoversion up to beta1
Dmitriy Zaporozhets [Fri, 15 Mar 2013 16:01:03 +0000 (18:01 +0200)]
version up to beta1

11 years agoremove separator between search & icons in header
Dmitriy Zaporozhets [Fri, 15 Mar 2013 15:35:54 +0000 (17:35 +0200)]
remove separator between search & icons in header

11 years agoMerge branch 'DanKnox-use_gollum_wikis'
Dmitriy Zaporozhets [Fri, 15 Mar 2013 15:21:13 +0000 (17:21 +0200)]
Merge branch 'DanKnox-use_gollum_wikis'

11 years agofew fixes afte merge gollum wiki
Dmitriy Zaporozhets [Fri, 15 Mar 2013 15:21:01 +0000 (17:21 +0200)]
few fixes afte merge gollum wiki

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

11 years agoFix highlight line for solarized theme
Dmitriy Zaporozhets [Fri, 15 Mar 2013 14:20:40 +0000 (16:20 +0200)]
Fix highlight line for solarized theme

11 years agospianch -> profile -> specify within block
Dmitriy Zaporozhets [Fri, 15 Mar 2013 14:05:07 +0000 (16:05 +0200)]
spianch -> profile -> specify within block

11 years agorestyle header a bit
Dmitriy Zaporozhets [Fri, 15 Mar 2013 13:39:47 +0000 (15:39 +0200)]
restyle header a bit

11 years agoreannotated
Dmitriy Zaporozhets [Fri, 15 Mar 2013 13:16:02 +0000 (15:16 +0200)]
reannotated

11 years agofinish up with solarized dark
Dmitriy Zaporozhets [Fri, 15 Mar 2013 13:14:56 +0000 (15:14 +0200)]
finish up with solarized dark

11 years agoadd dark solarized theme for code preview
Dmitriy Zaporozhets [Fri, 15 Mar 2013 13:09:34 +0000 (15:09 +0200)]
add dark solarized theme for code preview

11 years agoMerge branch 'feature/writeboard'
Dmitriy Zaporozhets [Fri, 15 Mar 2013 12:22:49 +0000 (14:22 +0200)]
Merge branch 'feature/writeboard'

11 years agoUse wiki tab for wiki, wall, snippets
Dmitriy Zaporozhets [Fri, 15 Mar 2013 12:20:03 +0000 (14:20 +0200)]
Use wiki tab for wiki, wall, snippets

11 years agoon wall subpage active tab should be wiki too
Dmitriy Zaporozhets [Fri, 15 Mar 2013 07:39:50 +0000 (09:39 +0200)]
on wall subpage active tab should be wiki too

11 years agorename writeboards to wiki
Dmitriy Zaporozhets [Fri, 15 Mar 2013 07:39:07 +0000 (09:39 +0200)]
rename writeboards to wiki

11 years agoadd resize button for better wiki reading
Dmitriy Zaporozhets [Thu, 14 Mar 2013 20:57:38 +0000 (22:57 +0200)]
add resize button for better wiki reading

11 years agoMerge wiki, wall & snippets under one tab - writeboards
Dmitriy Zaporozhets [Thu, 14 Mar 2013 20:24:27 +0000 (22:24 +0200)]
Merge wiki, wall & snippets under one tab - writeboards

11 years agoChange spinach tab tests to fit new tabs navigation
Dmitriy Zaporozhets [Thu, 14 Mar 2013 19:51:44 +0000 (21:51 +0200)]
Change spinach tab tests to fit new tabs navigation

11 years agoRemove tree single-tab panel
Dmitriy Zaporozhets [Thu, 14 Mar 2013 17:50:57 +0000 (19:50 +0200)]
Remove tree single-tab panel

11 years agoAdds DB-sensitive tablename escape for backup task.
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.

11 years agoAdd settings tab to project. Move all project administration there
Dmitriy Zaporozhets [Thu, 14 Mar 2013 17:28:29 +0000 (19:28 +0200)]
Add settings tab to project. Move all project administration there

11 years agoFix spinach tests
Dmitriy Zaporozhets [Thu, 14 Mar 2013 15:13:00 +0000 (17:13 +0200)]
Fix spinach tests

11 years agoremoved mistype
Dmitriy Zaporozhets [Thu, 14 Mar 2013 12:02:56 +0000 (14:02 +0200)]
removed mistype

11 years agouse refresh icon instead loader gif
Dmitriy Zaporozhets [Thu, 14 Mar 2013 12:02:24 +0000 (14:02 +0200)]
use refresh icon instead loader gif

11 years agoReplace projects_box with ui-box. Fixed team spinach test
Dmitriy Zaporozhets [Thu, 14 Mar 2013 11:12:11 +0000 (13:12 +0200)]
Replace projects_box with ui-box. Fixed team spinach test

11 years agoRedesign search filters
Dmitriy Zaporozhets [Thu, 14 Mar 2013 11:11:20 +0000 (13:11 +0200)]
Redesign search filters

11 years agoadd teams to search autocomplete
Dmitriy Zaporozhets [Thu, 14 Mar 2013 10:43:08 +0000 (12:43 +0200)]
add teams to search autocomplete

11 years agoRebuild team area
Dmitriy Zaporozhets [Thu, 14 Mar 2013 10:38:43 +0000 (12:38 +0200)]
Rebuild team area

11 years agoRemove separate search page from group
Dmitriy Zaporozhets [Thu, 14 Mar 2013 10:37:28 +0000 (12:37 +0200)]
Remove separate search page from group

11 years agoRestyled group -> edit area. Use select2 for transfer autocomplete
Dmitriy Zaporozhets [Thu, 14 Mar 2013 09:31:33 +0000 (11:31 +0200)]
Restyled group -> edit area. Use select2 for transfer autocomplete

11 years agostyle select2-searching too
Dmitriy Zaporozhets [Thu, 14 Mar 2013 08:20:45 +0000 (10:20 +0200)]
style select2-searching too

11 years agoMerge branch 'feature/select2-user-ajax'
Dmitriy Zaporozhets [Thu, 14 Mar 2013 08:20:25 +0000 (10:20 +0200)]
Merge branch 'feature/select2-user-ajax'

11 years agoFinish select2-ajax for users. Added Select2Helper for tests
Dmitriy Zaporozhets [Thu, 14 Mar 2013 08:16:27 +0000 (10:16 +0200)]
Finish select2-ajax for users. Added Select2Helper for tests

11 years agoFix whitespace on MARKUPS constant in GollumWiki class.
Dan Knox [Thu, 14 Mar 2013 07:07:01 +0000 (00:07 -0700)]
Fix whitespace on MARKUPS constant in GollumWiki class.

11 years agoLimit available Wiki formats to Markdown and RDoc.
Dan Knox [Thu, 14 Mar 2013 06:34:50 +0000 (23:34 -0700)]
Limit available Wiki formats to Markdown and RDoc.

11 years agoUse Gitlab Markdown for Markdown files and Gollum to render the rest.
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.

11 years agofix setting gon.api_token
Dmitriy Zaporozhets [Wed, 13 Mar 2013 21:45:47 +0000 (23:45 +0200)]
fix setting gon.api_token

11 years agoAllow single/multiple user select
Dmitriy Zaporozhets [Wed, 13 Mar 2013 20:32:04 +0000 (22:32 +0200)]
Allow single/multiple user select

11 years agomultiselect for ajax-users-select2
Dmitriy Zaporozhets [Wed, 13 Mar 2013 19:42:14 +0000 (21:42 +0200)]
multiselect for ajax-users-select2

11 years agoadd api users filter and integrate users select2
Dmitriy Zaporozhets [Wed, 13 Mar 2013 19:37:50 +0000 (21:37 +0200)]
add api users filter and integrate users select2

11 years agouser select2 javascript
Dmitriy Zaporozhets [Wed, 13 Mar 2013 19:37:13 +0000 (21:37 +0200)]
user select2 javascript

11 years agomd5 and utf_encode js libraries
Dmitriy Zaporozhets [Wed, 13 Mar 2013 19:36:53 +0000 (21:36 +0200)]
md5 and utf_encode js libraries

11 years agoselect2-rails gem added
Dmitriy Zaporozhets [Wed, 13 Mar 2013 19:36:26 +0000 (21:36 +0200)]
select2-rails gem added

11 years agoshow mail-to and block buttons on /admin/users/:id page
Dmitriy Zaporozhets [Wed, 13 Mar 2013 21:15:39 +0000 (23:15 +0200)]
show mail-to and block buttons on /admin/users/:id page

11 years agoUserTeam spinach fixed
Dmitriy Zaporozhets [Wed, 13 Mar 2013 20:30:33 +0000 (22:30 +0200)]
UserTeam spinach fixed

11 years agoFix spinach tests
Dmitriy Zaporozhets [Wed, 13 Mar 2013 19:58:32 +0000 (21:58 +0200)]
Fix spinach tests

11 years agoUse name+username in team -> new
Dmitriy Zaporozhets [Wed, 13 Mar 2013 17:24:30 +0000 (19:24 +0200)]
Use name+username in team -> new

11 years agoRemove team_member show page -> use user_path instead
Dmitriy Zaporozhets [Wed, 13 Mar 2013 17:16:36 +0000 (19:16 +0200)]
Remove team_member show page -> use user_path instead

11 years agostub git shell mv_repository
Dmitriy Zaporozhets [Tue, 12 Mar 2013 16:59:25 +0000 (18:59 +0200)]
stub git shell mv_repository

11 years agoask users to use ruby 1.9.3 for now
Dmitriy Zaporozhets [Tue, 12 Mar 2013 12:16:55 +0000 (14:16 +0200)]
ask users to use ruby 1.9.3 for now

11 years agocleanup ProjectMover
Dmitriy Zaporozhets [Tue, 12 Mar 2013 12:13:25 +0000 (14:13 +0200)]
cleanup ProjectMover

11 years agofix spinach after #3196
Dmitriy Zaporozhets [Tue, 12 Mar 2013 12:10:20 +0000 (14:10 +0200)]
fix spinach after #3196

11 years agoMerge pull request #3196 from Undev/feature/broken-projects-search-23049
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

11 years agoTests for dashboard projects fixed
Andrew8xx8 [Tue, 12 Mar 2013 11:15:14 +0000 (15:15 +0400)]
Tests for dashboard projects fixed

11 years agocheck gitlab-shell version in gitlab:check
Dmitriy Zaporozhets [Tue, 12 Mar 2013 10:53:07 +0000 (12:53 +0200)]
check gitlab-shell version in gitlab:check

11 years agofix project move email
Dmitriy Zaporozhets [Tue, 12 Mar 2013 10:40:49 +0000 (12:40 +0200)]
fix project move email

11 years agoUse gitlab-shell to move repos. Requires gitlab-shell v1.1.0
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

11 years agoTests improved
Andrew8xx8 [Tue, 12 Mar 2013 09:40:54 +0000 (13:40 +0400)]
Tests improved

11 years agoSearch fields were have same id's. Fixed
Andrew8xx8 [Tue, 12 Mar 2013 09:33:27 +0000 (13:33 +0400)]
Search fields were have same id's. Fixed

11 years agoSearch projects on dashboard was not worked. Fixed
Andrew8xx8 [Tue, 12 Mar 2013 09:26:45 +0000 (13:26 +0400)]
Search projects on dashboard was not worked. Fixed

11 years agorestyle and cleanup emails
Dmitriy Zaporozhets [Tue, 12 Mar 2013 08:46:04 +0000 (10:46 +0200)]
restyle and cleanup emails

11 years agoMerge pull request #3192 from hiroponz/convert-to-coffee
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

11 years agofix api internal test
Dmitriy Zaporozhets [Mon, 11 Mar 2013 13:47:44 +0000 (15:47 +0200)]
fix api internal test

11 years agoCovert to coffee.
Sato Hiroyuki [Mon, 11 Mar 2013 08:52:27 +0000 (17:52 +0900)]
Covert to coffee.

11 years agoReduce amount of user info provided with internal api
Dmitriy Zaporozhets [Mon, 11 Mar 2013 12:35:00 +0000 (14:35 +0200)]
Reduce amount of user info provided with internal api