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

3553 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Riyad Preukschas 8c89beb6f9 Change argument order for satellite actions to always start with the user 2012-10-26 00:26:47 +02:00
Riyad Preukschas 35b7a53955 Reorder methods in Gitlab::Satellite 2012-10-26 00:24:16 +02:00
Riyad Preukschas 8778961d33 Move prepare_satellite! to Gitlab::Satelite::Action 2012-10-26 00:24:02 +02:00
Riyad Preukschas 78235edda8 Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction 2012-10-26 00:19:01 +02:00
Riyad Preukschas 847bba9269 Add Gitlab::Satellite::Action 2012-10-26 00:10:40 +02:00
Riyad Preukschas 643ed9cbf3 Fix typos in Gitlab::Merge 2012-10-25 23:49:49 +02:00
Riyad Preukschas 0447ab375a Extract shared/clone_panel partial 2012-10-25 23:39:02 +02:00
Riyad Preukschas ff396e0a7e Extract search field into a partial 2012-10-25 23:39:02 +02:00
Riyad Preukschas 0e0c5c53a3 Merge pull request #1814 from hardchor/patch-1 
Some grammatical improvements
 2012-10-25 13:50:58 -07:00
hardchor b5ced56ba4 Some grammatical improvements 
Nothing too dramatic, just some improvements.
 2012-10-25 22:11:06 +02:00
Dmitriy Zaporozhets d005242d23 Merge pull request #1803 from gitlabhq/api_merge_request 
Api for merge request
 2012-10-25 03:49:31 -07:00
Valeriy Sizov 4281de3640 API: review 2 2012-10-25 13:38:55 +03:00
Valeriy Sizov 56bf829c75 API: fix after review 2012-10-25 13:19:18 +03:00
Valeriy Sizov e6cdfb607a API: tests for merge_requests 2012-10-25 13:13:01 +03:00
Dmitriy Zaporozhets fe6d122d23 Merge pull request #1785 from dosire/update-developer-documentation 
Refer developers to the vagrant vm and remove out of date documentation.
 2012-10-25 02:36:54 -07:00
Dmitriy Zaporozhets 11452c903f Fix 500 error on tree view woth submodule 2012-10-25 12:30:09 +03:00
Dmitriy Zaporozhets 6d0dcb6614 Reduce max commit diff size. Added Commit::DIFF_SAFE_SIZE 2012-10-25 12:16:14 +03:00
Dmitriy Zaporozhets 1ea0dd0ffc App docs 2012-10-25 11:59:41 +03:00
Dmitriy Zaporozhets 03f43291cd Remove easy script cause its should be improved 2012-10-25 11:57:23 +03:00
Dmitriy Zaporozhets f9def67981 move installation docs under separate dir 2012-10-25 11:57:23 +03:00
randx fd86bf4ae9 Decouple requirements and install 2012-10-25 11:57:23 +03:00
randx 5ff6fadcc1 refactor installation doc 2012-10-25 11:57:23 +03:00
randx c8fe07ed32 version 2 2012-10-25 11:57:23 +03:00
randx 8f3adf9f03 Improved installation manual 2012-10-25 11:57:23 +03:00
Valeriy Sizov b6628b4a97 Merge pull request #1797 from sholden/patch-2 
Fix broken Note scopes with lambdas, 4.0 compat
 2012-10-25 01:27:41 -07:00
Scott Holden 2335d7b9cf Fix broken Note scopes with lambdas, 4.0 compat 
Without lambdas, Date.today will be evaluated in the class body.
For it to have a running scope of last week etc, it will need to
be evaluated each time the scope is called.
In Rails 4.0, lambdas will be required for all scopes, so not a bad
idea to go ahead and change them all now.
 2012-10-24 21:54:15 -07:00
Sytse Sijbrandij bcd001f295 Refer developers to the vagrant vm and remove out of date documentation. 2012-10-24 16:45:18 +02:00
Dmitriy Zaporozhets 7ecfaccf14 Merge branch 'master' into stable 2012-10-24 16:14:03 +03:00