deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4549 commits 6 branches 43 tags 25 MiB
Commit graph

4549 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrey Kumanyaev
0f39610532 Add control of action in project to team assigment 2013-03-18 16:07:04 +04:00
Andrey Kumanyaev
a0f2fbc250 Fix bug with downgrade permissions on first project assigment to team 2013-03-18 15:44:26 +04:00
Dmitriy Zaporozhets
aa5327a565 Fix project_limit being ignored on signup 2013-03-18 13:22:41 +02:00
Dmitriy Zaporozhets
3513902396 Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests 
Fix failure of cheking a merge request after conflict.
 2013-03-18 03:39:51 -07:00
Dmitriy Zaporozhets
d8ad01bb6e Merge pull request #3243 from lyda/misspellings 
Result of misspellings run.
 2013-03-18 03:37:37 -07:00
Kevin Lyda
415bade302 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.
 2013-03-17 19:46:54 +00:00
murank
77295b00b8 Fix the order of clearing a satellite 2013-03-17 23:50:20 +09:00
Dmitriy Zaporozhets
a96e0ec57e Merge pull request #3240 from DanKnox/fix_wiki_migrator 
Fix Wiki migration task and add more test coverage.
 2013-03-17 04:48:27 -07:00
Dan Knox
330fe4162e 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.
 2013-03-16 18:01:48 -07:00
Dmitriy Zaporozhets
c367cc5ca6 Show projet name with namespace on team _projects widget 2013-03-16 14:40:16 +02:00
Dmitriy Zaporozhets
cf848fd06d Merge pull request #3217 from chrislawlor/2437 
Adds DB-sensitive tablename escape for backup task.
 2013-03-16 02:26:01 -07:00
Dmitriy Zaporozhets
699c9cd499 Gemfile.lock with gollum 2013-03-15 18:50:45 +02:00
Dmitriy Zaporozhets
9f3a593092 Merge pull request #3230 from DanKnox/update_gollum_repo_location 
Update gollum repository location in the Gemfile.
 2013-03-15 09:46:23 -07:00
Sytse Sijbrandij
50c05b71b7 Update links to GitLab.com after renaming of GitLab cloud. 2013-03-15 17:33:43 +01:00
Dan Knox
8403e99f28 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.
 2013-03-15 09:05:02 -07:00
Dmitriy Zaporozhets
fdfc408d87 version up to beta1 2013-03-15 18:01:03 +02:00
Dmitriy Zaporozhets
d75cb57f9c remove separator between search & icons in header 2013-03-15 17:35:54 +02:00
Dmitriy Zaporozhets
3c050a29a7 Merge branch 'DanKnox-use_gollum_wikis' 2013-03-15 17:21:13 +02:00
Dmitriy Zaporozhets
94f0493999 few fixes afte merge gollum wiki 2013-03-15 17:21:01 +02:00
Dmitriy Zaporozhets
71ab011a17 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
 2013-03-15 16:55:07 +02:00
Dmitriy Zaporozhets
4f23c30ace Fix highlight line for solarized theme 2013-03-15 16:20:40 +02:00
Dmitriy Zaporozhets
86e23a584a spianch -> profile -> specify within block 2013-03-15 16:05:07 +02:00
Dmitriy Zaporozhets
2449bea2c4 restyle header a bit 2013-03-15 15:39:47 +02:00
Dmitriy Zaporozhets
21b1fee92c reannotated 2013-03-15 15:16:02 +02:00
Dmitriy Zaporozhets
2a04341fba finish up with solarized dark 2013-03-15 15:14:56 +02:00
Dmitriy Zaporozhets
8cad1c9f4c add dark solarized theme for code preview 2013-03-15 15:09:34 +02:00
Dmitriy Zaporozhets
7799b5bda6 Merge branch 'feature/writeboard' 2013-03-15 14:22:49 +02:00
Dmitriy Zaporozhets
35ad4fe7db Use wiki tab for wiki, wall, snippets 2013-03-15 14:20:03 +02:00
Dmitriy Zaporozhets
39bbdc468f on wall subpage active tab should be wiki too 2013-03-15 09:39:50 +02:00
Dmitriy Zaporozhets
5bf88506ec rename writeboards to wiki 2013-03-15 09:39:07 +02:00
Dmitriy Zaporozhets
2681a01bcf add resize button for better wiki reading 2013-03-14 22:57:38 +02:00
Dmitriy Zaporozhets
a685624d27 Merge wiki, wall & snippets under one tab - writeboards 2013-03-14 22:24:27 +02:00
Dmitriy Zaporozhets
753ecbdcec Change spinach tab tests to fit new tabs navigation 2013-03-14 21:51:44 +02:00
Dmitriy Zaporozhets
38ecec4472 Remove tree single-tab panel 2013-03-14 19:50:57 +02:00
Chris Lawlor
3df5253cc3 Adds DB-sensitive tablename escape for backup task. 
Uses ActiveRecord::Base.connection.quote_table_name.
Fixes issue 2437.
 2013-03-14 13:30:25 -04:00
Dmitriy Zaporozhets
5c4e74acc3 Add settings tab to project. Move all project administration there 2013-03-14 19:28:29 +02:00
Dmitriy Zaporozhets
d2b882fae5 Fix spinach tests 2013-03-14 17:13:00 +02:00
Dmitriy Zaporozhets
da3bc14d80 removed mistype 2013-03-14 14:02:56 +02:00
Dmitriy Zaporozhets
a8b1f8c0e5 use refresh icon instead loader gif 2013-03-14 14:02:24 +02:00
Dmitriy Zaporozhets
88d42c2e1c Replace projects_box with ui-box. Fixed team spinach test 2013-03-14 13:12:11 +02:00
Dmitriy Zaporozhets
e84df44ea0 Redesign search filters 2013-03-14 13:11:20 +02:00
Dmitriy Zaporozhets
4673c85379 add teams to search autocomplete 2013-03-14 12:43:08 +02:00
Dmitriy Zaporozhets
441d256188 Rebuild team area 2013-03-14 12:38:43 +02:00
Dmitriy Zaporozhets
f4f36f78dd Remove separate search page from group 2013-03-14 12:37:28 +02:00
Dmitriy Zaporozhets
cc1dd624aa Restyled group -> edit area. Use select2 for transfer autocomplete 2013-03-14 11:31:33 +02:00
Dmitriy Zaporozhets
2f6d289f32 style select2-searching too 2013-03-14 10:20:45 +02:00
Dmitriy Zaporozhets
0e57085795 Merge branch 'feature/select2-user-ajax' 2013-03-14 10:20:25 +02:00
Dmitriy Zaporozhets
ef05423f47 Finish select2-ajax for users. Added Select2Helper for tests 2013-03-14 10:16:27 +02:00
Dan Knox
d69a37e0b7 Fix whitespace on MARKUPS constant in GollumWiki class. 2013-03-14 00:07:01 -07:00
Dan Knox
6d25484417 Limit available Wiki formats to Markdown and RDoc. 2013-03-13 23:34:50 -07:00