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

4568 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michel Salib
e2ddf03c7e Gitlab does not use gitolite anymore. 2013-03-19 11:52:59 +01:00
Dmitriy Zaporozhets
1752c6dc8b Uncheck notify team checkbox by default 2013-03-19 09:38:33 +02:00
Dmitriy Zaporozhets
e68955b4fc add permission messages to project edit 2013-03-19 09:27:12 +02:00
Dmitriy Zaporozhets
fb1c85061e remove unused spec 2013-03-19 08:40:32 +02:00
Dmitriy Zaporozhets
54f40301ff fixed form input overflow on 1024px res 2013-03-19 08:39:26 +02:00
Dmitriy Zaporozhets
306ea84e85 Merge pull request #3251 from AlexDenisov/api_additional_user_fields 
Abilities added to /user and /sign_in requests
 2013-03-18 23:20:11 -07:00
Dmitriy Zaporozhets
924643198c Merge pull request #3252 from hiroponz/fix-timeout-large-repository 
Fix timeout error while showing the network graph.
 2013-03-18 23:17:52 -07:00
Sato Hiroyuki
92de0faf6e Fix spec errors. 2013-03-19 14:21:00 +09:00
Alex Denisov
a15fe61fb0 API docs updated 2013-03-19 04:47:08 +00:00
Sato Hiroyuki
fc66c18349 Fix travis failed randomly by timeout. 2013-03-19 12:53:12 +09:00
Sato Hiroyuki
e00e54b69c Fix timeout error while showing the very large repo like git repo. 2013-03-19 10:36:40 +09:00
Sato Hiroyuki
46fa92187d Refactor: removing duplicate code. 2013-03-19 10:00:29 +09:00
Dmitriy Zaporozhets
7587a3b2fc fixed check for snippets module enabled 2013-03-18 23:44:57 +02:00
Dmitriy Zaporozhets
747292e2d3 reorder features list in project -> edit page 2013-03-18 23:38:16 +02:00
Dmitriy Zaporozhets
b765a7958d Move snippets to own tab as feature. Make it disabled for new projects by default 2013-03-18 23:33:41 +02:00
Dmitriy Zaporozhets
112dc875ba feature: wiki -> new page 2013-03-18 23:08:54 +02:00
Dmitriy Zaporozhets
ae06a0aab8 Return own tab for wall. Improve Wiki nav. Removed attachments listing page 2013-03-18 22:43:14 +02:00
Alex Denisov
28e7d1a8bf Abilities added to /user and /sign_in requests 2013-03-18 20:11:28 +00:00
Dmitriy Zaporozhets
6956f1f6e1 Improve usability of project edit page 2013-03-18 20:50:41 +02:00
Dmitriy Zaporozhets
0c884498d2 Rename project_head partial to settings_nav 2013-03-18 19:35:27 +02:00
Dmitriy Zaporozhets
0eccc08015 show project description in project listing on dashboard 2013-03-18 19:22:15 +02: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