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

3381 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets
b6fc031031 Update Gemfile with 1.9 syntax. Define ref for forks 2012-10-31 13:53:38 +02:00
Dmitriy Zaporozhets
6d2e64164a Merge pull request #1872 from mktums/patch-1 
Update doc/install/databases.md
 2012-10-30 05:01:21 -07:00
Mike TUMS
1d15586fee Update doc/install/databases.md 
Update docs for PostgreSQL installation
 2012-10-30 15:58:10 +04:00
Dmitriy Zaporozhets
404040d7ae Fix invalid template path for huge commit 2012-10-30 13:35:57 +02:00
Dmitriy Zaporozhets
8272e18e57 Project path validation: array of not allowed paths 2012-10-30 13:27:15 +02:00
Dmitriy Zaporozhets
37e39e4176 Added bare import script. Removed old unworking script 2012-10-30 13:04:56 +02:00
randx
36dbac2fd9 More seeds 2012-10-30 10:03:21 +02:00
randx
e4cf99db46 Refactor milestones related functionality. Added seeds for Milestine and MR 2012-10-30 09:22:24 +02:00
Valeriy Sizov
53a3be03fc Update app/views/profile/account.html.haml 
TYPO #1870
 2012-10-30 00:32:32 +02:00
Valeriy Sizov
9d56c7f657 Update app/views/shared/_no_ssh.html.haml 
TYPO
 2012-10-30 00:29:13 +02:00
randx
a8398e5124 Fix merge request count for milestone index 2012-10-29 23:50:35 +02:00
randx
e705344daa Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-10-29 23:46:46 +02:00
randx
2d887d91e1 Merge branch 'piffio-public_submission_milestones_for_mr' 2012-10-29 23:45:21 +02:00
randx
f417a265d7 Finalize milestones for Merge Requests 2012-10-29 23:45:11 +02:00
Riyad Preukschas
0a9adbbe4a Fix no SSH key warning 2012-10-29 21:51:28 +01:00
randx
d4e070cfad Improve styles. Add merge request completness to milestone percentage 2012-10-29 22:40:00 +02:00
randx
ecdf778e80 Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr 
Conflicts:
	app/views/merge_requests/_form.html.haml
 2012-10-29 21:37:46 +02:00
randx
e469084ccc Fix installation docs 2012-10-29 21:34:16 +02:00
Dmitriy Zaporozhets
50a6c614b5 Merge pull request #1818 from riyad/refactor-satellite-actions 
Refactor Satellite Code
 2012-10-29 04:12:26 -07:00
Sergio Visinoni
263282dec9 Show Milestone information in MR Listing 
When a MR belongs to a Milestone, show this information in the listing
with a small box telling the Milestone title.
 2012-10-28 09:31:52 +01:00
Dmitriy Zaporozhets
78a64ca100 Merge pull request #1851 from riyad/link-to-commit-authors-everywhere 
Link to commit authors everywhere
 2012-10-27 12:22:57 -07:00
Dmitriy Zaporozhets
ca524d8df3 Merge pull request #1848 from seesaw/repos_symlinked 
gitolite's repositories folder symlinked patch
 2012-10-27 12:21:03 -07:00
Riyad Preukschas
646bad43e9 Fix styles 2012-10-27 18:27:51 +02:00
Riyad Preukschas
3d0197246e Use #author_link for blame, commits and tree 2012-10-27 18:27:47 +02:00
Riyad Preukschas
c78359a84b Generalize CommitDecorator#author_link to #person_link 2012-10-27 18:15:00 +02:00
Riyad Preukschas
17cec05087 Make new/edit issue forms use containers on the page instead of adding their own 
Fixes #1830
 2012-10-27 17:54:24 +02:00
Riyad Preukschas
2f5e44a02d Enable/disable from buttons on all input events (not just key events) 
Fixes #1836
 2012-10-27 17:00:51 +02:00
Michele Franzin
c370c1b389 gitolite's repositories folder symlinked patch 2012-10-27 16:12:01 +02:00
randx
13e72f5a6f Merge branch 'NARKOZ-front-end' 2012-10-27 11:28:08 +03:00
randx
3c5a3fe0ae Merge branch 'front-end' of https://github.com/NARKOZ/gitlabhq into NARKOZ-front-end 
Conflicts:
	app/views/issues/_form.html.haml
 2012-10-27 11:24:11 +03:00
Dmitriy Zaporozhets
2e0e63e19a Merge pull request #1841 from sectioneight/fix-postgres-documentation 
Fix PostgreSQL setup instructions
 2012-10-27 01:22:02 -07:00
Aiden Scandella
d2c7a75970 Fix PostgreSQL setup instructions 
The config skeleton for postgres is called `database.yml.postgresql`,
not `database.yml.postgres`.
 2012-10-26 14:05:20 -07:00
randx
cec97c2708 we dont show commit message on tags page any more 2012-10-26 22:10:17 +03:00
randx
72f984e3d3 Prevent grit from caching graph commits 2012-10-26 21:52:26 +03:00
Dmitriy Zaporozhets
1c9351abf0 Restyle branches list. Remove unneccesary styles from tree avatar 2012-10-26 19:00:09 +03:00
Dmitriy Zaporozhets
b4708d006c Restyled git tags page. Added truncated tags message 2012-10-26 18:37:12 +03:00
Dmitriy Zaporozhets
f73e46eece Remove gitolite config sed because our gitolite fork already has it in sources 2012-10-26 17:13:24 +03:00
Sergio Visinoni
e51c37bdbd Display Merge Requests <-> Milestone relations 
Show the relation between Merge Requests and Mileston in different
places:
- Merge Request page
- Milestone list page
- Milestone details page
 2012-10-26 16:12:40 +02:00
Sergio Visinoni
a7d0816933 Add Milestone information in Merge Requests 
Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
  Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
  Merge Requests listing page
 2012-10-26 16:12:40 +02:00
Saito
4f687aaa8e Merge pull request #1827 from mgrobelin/master 
grack auth bugfix: allow dots in reponame
 2012-10-26 06:35:37 -07:00
Markus Grobelin
bd50a9f466 grack: allow repositories to have dots in name, e.g. serverconfigs-example.com.git 2012-10-26 14:05:57 +02:00
Riyad Preukschas
904615c150 Update satellite action docs 2012-10-26 02:50:24 +02:00
Riyad Preukschas
7192f86ed0 Fix Satellite#lock 2012-10-26 02:32:17 +02:00
Riyad Preukschas
700a784bc9 Refactor EditFileAction#update and rename it to commit! 2012-10-26 01:59:50 +02:00
Riyad Preukschas
3080127354 Fix timeouts in MergeAction 2012-10-26 01:44:50 +02:00
Riyad Preukschas
0ebcc60a33 Move locking from Satellite::Action to Satellite and add checks 2012-10-26 01:44:20 +02:00
Riyad Preukschas
0e9d4f30f4 Refactor Satellite#clear and rename it to clear_and_update! 2012-10-26 01:32:33 +02:00
Riyad Preukschas
fba8ad5607 Move Gitlab::Satellite into the Satellite module 2012-10-26 00:56:24 +02:00
Riyad Preukschas
5f16687805 Update arguments for Gitlab::Satellite::EditFileAction#initialize 2012-10-26 00:39:23 +02:00
Riyad Preukschas
55779b00ea Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileAction 2012-10-26 00:33:53 +02:00