Dmitriy Zaporozhets
|
3e1ce8880b
|
Remove randomly failing test
|
2013-07-10 19:12:54 +03:00 |
|
Dmitriy Zaporozhets
|
0b012d9662
|
GroupLinks: Empty Scaffold, routes + sample page
|
2013-07-10 16:14:00 +03:00 |
|
Dmitriy Zaporozhets
|
e34eac0867
|
Mention enterprise edition for easy identification
|
2013-07-10 15:04:23 +03:00 |
|
Dmitriy Zaporozhets
|
6a9aed1e87
|
Merge branch 'master' into 6-0-dev
Conflicts:
CHANGELOG
VERSION
app/views/admin/teams/projects/new.html.haml
app/views/projects/teams/available.html.haml
doc/install/installation.md
|
2013-07-10 14:03:00 +03:00 |
|
Dmitriy Zaporozhets
|
381638b77f
|
Merge pull request #4510 from Razer6/fix_not_found_lexers
Fix Pygments 500 error if lexer not found by name
|
2013-07-10 03:58:41 -07:00 |
|
Dmitriy Zaporozhets
|
10491ce082
|
Merge pull request #4511 from yuters/patch-3
UI : navbar tooltip position fix when "loading" appears.
|
2013-07-10 03:56:51 -07:00 |
|
Dmitriy Zaporozhets
|
90d497056f
|
Merge pull request #4515 from amacarthur/fork-admin
Additon of apis for fork administration.
|
2013-07-10 03:54:58 -07:00 |
|
Dmitriy Zaporozhets
|
d2d566b162
|
Merge branch 'master' of github.com:gitlabhq/gitlabhq
|
2013-07-10 13:49:29 +03:00 |
|
Dmitriy Zaporozhets
|
8dd6af1466
|
Sanitize user attrs on model level
|
2013-07-10 13:48:50 +03:00 |
|
Dmitriy Zaporozhets
|
223d264051
|
Sanitize user attrs on model level
|
2013-07-10 13:48:03 +03:00 |
|
Yves Senn
|
a8b544ed77
|
Merge pull request #4519 from kwongius/team-assignment-text
Fix header text for setting greatest team access to a project
|
2013-07-09 11:21:18 -07:00 |
|
Dmitriy Zaporozhets
|
3dcc441916
|
Cleaner dashboard sidebar
|
2013-07-09 20:52:06 +03:00 |
|
Dmitriy Zaporozhets
|
03586c6c79
|
Fix User#can_create_project?
|
2013-07-09 20:51:49 +03:00 |
|
Kevin Wong
|
1da67c2cec
|
Fix header text for setting greatest team access to a project
|
2013-07-09 10:42:35 -06:00 |
|
Dmitriy Zaporozhets
|
b8c3f9a628
|
Extend shortcuts list modal. Mention it at help page
|
2013-07-09 18:34:44 +03:00 |
|
Dmitriy Zaporozhets
|
f63cd42bab
|
Better control placement on project page
|
2013-07-09 17:44:35 +03:00 |
|
Dmitriy Zaporozhets
|
5baac66992
|
More info (like 10 branches, 5 tags) at project show page
|
2013-07-09 10:44:47 +03:00 |
|
Angus MacArthur
|
ea5a006f27
|
Additon of apis for fork administration.
Added ability to add and remove the forked from/to relatioinship
between existing repos.
|
2013-07-08 17:34:00 -04:00 |
|
Dmitriy Zaporozhets
|
e1ac3db927
|
Merge branch 'change-to-default-installer' of /home/git/repositories/gitlab/gitlabhq
|
2013-07-08 17:36:21 +00:00 |
|
Dmitriy Zaporozhets
|
63e532eff0
|
Cache MR diffs result. Improve diff output
|
2013-07-08 20:12:35 +03:00 |
|
Sytse Sijbrandij
|
de680eb8c0
|
Use default system editor.
|
2013-07-08 18:52:10 +02:00 |
|
Dmitriy Zaporozhets
|
967d42e0c8
|
Fix unicorn init and config
|
2013-07-08 19:28:59 +03:00 |
|
Dmitriy Zaporozhets
|
87f4e1f153
|
init.d script for unicorn
|
2013-07-08 18:28:40 +03:00 |
|
Dmitriy Zaporozhets
|
66d6c80966
|
Disable threadsafety
|
2013-07-08 18:24:02 +03:00 |
|
Dmitriy Zaporozhets
|
fe4601361d
|
Milestone page: reduce truncate length to prevent issue title overflow
|
2013-07-08 16:05:09 +03:00 |
|
Dmitriy Zaporozhets
|
7ebbb6e33f
|
Added new entries to changelog. Version up to 5.4.0.pre
|
2013-07-08 13:59:56 +03:00 |
|
Dmitriy Zaporozhets
|
9ee86156db
|
Merge pull request #4508 from Razer6/fix_broken_api_links
Fix broken API links, fixes #4463
|
2013-07-08 03:22:12 -07:00 |
|
Dmitriy Zaporozhets
|
6ace422c29
|
Merge branch 'master' into 6-0-dev
Conflicts:
Gemfile
Gemfile.lock
|
2013-07-08 09:50:10 +03:00 |
|
Dmitriy Zaporozhets
|
6f5f5e7ee3
|
Add suppoort of unicorn and fog gems
|
2013-07-08 09:47:31 +03:00 |
|
Dmitriy Zaporozhets
|
cefd8fe2fa
|
Merge branch 'rename-support-forum-to-mailing-list' of /home/git/repositories/gitlab/gitlabhq
|
2013-07-08 06:29:14 +00:00 |
|
Dmitriy Zaporozhets
|
2882d16e7a
|
cleanup puma config a bit
|
2013-07-08 07:55:16 +03:00 |
|
Dmitriy Zaporozhets
|
db11c1fd88
|
Puma to 2.3.1
|
2013-07-08 07:38:19 +03:00 |
|
Dmitriy Zaporozhets
|
e72900d8e3
|
Merge branch 'master' of github.com:gitlabhq/gitlabhq
|
2013-07-08 00:22:21 +03:00 |
|
Martin Bastien
|
9f2e1b33a4
|
navbar tooltip position fix when "loading" appears.
|
2013-07-07 13:30:29 -04:00 |
|
Robert Schilling
|
db325ef940
|
Fix Pygments 500 error if lexer not found by name. Use first alias instead. fixes #4473, #4451
|
2013-07-07 19:00:07 +02:00 |
|
Yves Senn
|
c04e973327
|
Merge pull request #4509 from bbodenmiller/cont-updates
minor contributing guide updates
|
2013-07-07 04:49:28 -07:00 |
|
Ben Bodenmiller
|
b686b4b962
|
minor contributing guide updates
* issues & pr in English
* appropriate language
* typo & format fix
* not catch all pull request
* update changelog
|
2013-07-07 04:46:37 -07:00 |
|
Robert Schilling
|
4de11c2009
|
Fix broken API links, fixes #4463
|
2013-07-07 12:35:37 +02:00 |
|
Sytse Sijbrandij
|
c64ee6ac33
|
Rename support forum to mailing list to prevent duplication on community page of GitLab.org.
|
2013-07-07 11:30:31 +02:00 |
|
Dmitriy Zaporozhets
|
5315fd5a59
|
Merge pull request #4505 from m4tthumphrey/patch-1
Added client list to API doc
|
2013-07-06 02:38:04 -07:00 |
|
Matt Humphrey
|
4bba945437
|
Added client list to API doc
|
2013-07-06 10:14:06 +01:00 |
|
Dmitriy Zaporozhets
|
1738c17f33
|
Update puma
|
2013-07-06 12:13:28 +03:00 |
|
Dmitriy Zaporozhets
|
2643ee72a9
|
docs to ruby 2.0
|
2013-07-06 10:59:00 +03:00 |
|
Dmitriy Zaporozhets
|
7ee53643cf
|
Fix commit pagination
|
2013-07-06 10:58:33 +03:00 |
|
Dmitriy Zaporozhets
|
96448d1b7b
|
Fix shortcuts popup
|
2013-07-05 15:19:31 +03:00 |
|
Dmitriy Zaporozhets
|
5067e9dc88
|
Minor UI improve for dashboard events
|
2013-07-04 17:10:34 +03:00 |
|
Dmitriy Zaporozhets
|
5f0b50db7a
|
Discover default branch on project creationg
|
2013-07-04 14:32:02 +03:00 |
|
Yves Senn
|
cab2ba0af3
|
Merge pull request #4476 from tstone2077/master
Updating documentation to reflect #3836 (resolving #4443)
|
2013-07-04 04:28:53 -07:00 |
|
Dmitriy Zaporozhets
|
d0f3e993c5
|
Merge branch 'puma_cluster_recommendation' of /home/git/repositories/gitlab/gitlabhq
|
2013-07-04 11:08:33 +00:00 |
|
Jacob Vosmaer
|
ae9e4a52c5
|
Add cluster mode instructions to puma.rb.example
|
2013-07-04 11:14:03 +02:00 |
|