OSDN Git Service
Dmitriy Zaporozhets [Wed, 20 Mar 2013 08:19:00 +0000 (10:19 +0200)]
Dont load diff in compare over 100 commits
Dmitriy Zaporozhets [Wed, 20 Mar 2013 07:53:39 +0000 (09:53 +0200)]
send wall message with crtl+enter
Dmitriy Zaporozhets [Wed, 20 Mar 2013 07:35:24 +0000 (00:35 -0700)]
Merge pull request #3247 from Undev/feature/fix_bug_in_team_assigment
Fix bug with downgrade permissions on first project assigment to team
Dmitriy Zaporozhets [Wed, 20 Mar 2013 07:32:45 +0000 (00:32 -0700)]
Merge pull request #3264 from yuters/patch-2
Fix user path in markdown
Dmitriy Zaporozhets [Wed, 20 Mar 2013 07:29:05 +0000 (00:29 -0700)]
Merge pull request #3266 from DanKnox/fix_wiki_cancel_edit_button
Fix the Cancel button on the Edit Wiki page.
Dan Knox [Wed, 20 Mar 2013 04:28:10 +0000 (21:28 -0700)]
Fix the Cancel button on the Edit Wiki page.
The Cancel button on the Edit Wiki page was still redirecting back
to the "Index" page which is no longer the default Wiki page.
This commit changes the Cancel button in the following ways:
* Pressing Cancel while editing an existing Wiki page will now
redirect you back to the latest version of that page.
* Pressing Cancel while editing a brand new Wiki home page that
does not yet exist will redirect you to back to the same Edit
Wiki Home page.
Martin Bastien [Wed, 20 Mar 2013 00:29:59 +0000 (21:29 -0300)]
Fix user path in markdown
Dmitriy Zaporozhets [Tue, 19 Mar 2013 18:11:47 +0000 (20:11 +0200)]
Fix bug showing merge MR in milestone open list
Dmitriy Zaporozhets [Tue, 19 Mar 2013 18:00:41 +0000 (20:00 +0200)]
refactor emails a bit. Add email on ssh key creation
Dmitriy Zaporozhets [Tue, 19 Mar 2013 17:17:59 +0000 (19:17 +0200)]
5.0 beta2
Dmitriy Zaporozhets [Tue, 19 Mar 2013 16:52:17 +0000 (18:52 +0200)]
rails up to 3.2.13
Dmitriy Zaporozhets [Tue, 19 Mar 2013 16:14:59 +0000 (18:14 +0200)]
remove ajax loader from wall
Dmitriy Zaporozhets [Tue, 19 Mar 2013 16:07:14 +0000 (18:07 +0200)]
Dont show blocked users in autocomplete
Dmitriy Zaporozhets [Tue, 19 Mar 2013 15:59:10 +0000 (08:59 -0700)]
Merge pull request #3255 from michelsalib/patch-1
Gitlab does not use gitolite anymore.
Dmitriy Zaporozhets [Tue, 19 Mar 2013 15:53:21 +0000 (17:53 +0200)]
fix incorrectly moved spinach step
Dmitriy Zaporozhets [Tue, 19 Mar 2013 13:54:58 +0000 (15:54 +0200)]
added sanitize and linkify functions. Moved some js to lib/
Dmitriy Zaporozhets [Tue, 19 Mar 2013 13:37:11 +0000 (15:37 +0200)]
removed few outdated tests
Dmitriy Zaporozhets [Tue, 19 Mar 2013 13:11:31 +0000 (15:11 +0200)]
Comment external issue tracker by default in gitlab.yml.example
Dmitriy Zaporozhets [Tue, 19 Mar 2013 13:04:58 +0000 (15:04 +0200)]
use scrollTop solution for both chrome & firefox
Dmitriy Zaporozhets [Tue, 19 Mar 2013 12:58:58 +0000 (14:58 +0200)]
fix wall feature. removed duplicated test
Dmitriy Zaporozhets [Tue, 19 Mar 2013 12:50:26 +0000 (14:50 +0200)]
wall comment does not create an event on dashboard any more
Dmitriy Zaporozhets [Tue, 19 Mar 2013 12:39:32 +0000 (14:39 +0200)]
fix tests. added jquery.timeago.js
Dmitriy Zaporozhets [Tue, 19 Mar 2013 11:28:29 +0000 (13:28 +0200)]
add attachemnts support for wall
Michel Salib [Tue, 19 Mar 2013 10:52:59 +0000 (11:52 +0100)]
Gitlab does not use gitolite anymore.
Dmitriy Zaporozhets [Tue, 19 Mar 2013 10:35:55 +0000 (12:35 +0200)]
load notes for wall via api
Dmitriy Zaporozhets [Tue, 19 Mar 2013 10:35:42 +0000 (12:35 +0200)]
move Wall to own resource
Dmitriy Zaporozhets [Tue, 19 Mar 2013 10:34:59 +0000 (12:34 +0200)]
add wall.scss
Dmitriy Zaporozhets [Tue, 19 Mar 2013 10:34:14 +0000 (12:34 +0200)]
Remove wall from basic notes logic
Dmitriy Zaporozhets [Tue, 19 Mar 2013 07:38:33 +0000 (09:38 +0200)]
Uncheck notify team checkbox by default
Dmitriy Zaporozhets [Tue, 19 Mar 2013 07:27:12 +0000 (09:27 +0200)]
add permission messages to project edit
Dmitriy Zaporozhets [Tue, 19 Mar 2013 06:40:32 +0000 (08:40 +0200)]
remove unused spec
Dmitriy Zaporozhets [Tue, 19 Mar 2013 06:39:26 +0000 (08:39 +0200)]
fixed form input overflow on 1024px res
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
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.
Sato Hiroyuki [Tue, 19 Mar 2013 04:46:07 +0000 (13:46 +0900)]
Fix spec errors.
Alex Denisov [Mon, 18 Mar 2013 21:06:24 +0000 (21:06 +0000)]
API docs updated
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
Alex Denisov [Mon, 18 Mar 2013 20:11:28 +0000 (20:11 +0000)]
Abilities added to /user and /sign_in requests
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
Andrey Kumanyaev [Mon, 18 Mar 2013 12:07:04 +0000 (16:07 +0400)]
Add control of action in project to team assigment
Andrey Kumanyaev [Mon, 18 Mar 2013 11:44:26 +0000 (15:44 +0400)]
Fix bug with downgrade permissions on first project assigment to team
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