Commit graph

2802 commits

Author SHA1 Message Date
Alex Denisov
562af7a6a2 Merge branch 'master' into normalize_capitalization 2012-09-06 11:40:56 +03:00
Alex Denisov
a65ce74843 Spec fixed 2012-09-06 11:40:16 +03:00
Alex Denisov
09a86bd4d6 Capitlization of /gitlab/i normalized. #1367 2012-09-06 11:21:35 +03:00
miks
ab057bb5db proper Grape params hash simulation 2012-09-06 10:20:59 +03:00
Cornelio
b3c8688da3 fix bulk_import for #1309 2012-09-06 08:56:46 +02:00
miks
cd846ba2b5 Fix tests 2012-09-06 09:52:27 +03:00
randx
e4447de23f Cucumber refactoring 2012-09-06 09:15:51 +03:00
miks
94c5054566 count against last project 2012-09-06 01:06:02 +03:00
miks
e3b1f62c6b convert params hash to array 2012-09-06 00:13:25 +03:00
Sytse Sijbrandij
adb724f65e Ignore chef dir. 2012-09-05 22:22:33 +02:00
Robert Speicher
b3bbf53e9b Set the size of emoji to be 20x20
Forgot they were so big!
2012-09-05 16:14:54 -04:00
miks
52e99b6eb9 Merge branch 'master' of git://github.com/gitlabhq/gitlabhq into project_users_api 2012-09-05 23:08:45 +03:00
Robert Speicher
67a6a0b29b Change Gitlab::Markdown to a module; add emoji parsing 2012-09-05 16:07:39 -04:00
Robert Speicher
90f587f4ee Move the entire gfm method to Gitlab::Markdown, which will be a module now 2012-09-05 16:06:20 -04:00
Robert Speicher
880a233e6d Add specs for parsing Emoji 2012-09-05 16:05:20 -04:00
Robert Speicher
d480a478c1 Add emoji image files 2012-09-05 16:04:41 -04:00
miks
8f7360f390 API on adding users to project implemented 2012-09-05 23:01:03 +03:00
randx
21bfd1e7fc minor css improvements 2012-09-05 23:00:10 +03:00
Dmitriy Zaporozhets
19a5219746 Merge pull request #1378 from NARKOZ/validations
validate boolean attributes
2012-09-05 04:07:35 -07:00
Nihad Abbasov
0b559cdece add validations for boolean attributes 2012-09-05 04:01:11 -07:00
Nihad Abbasov
2680371785 bump shoulda-matchers 2012-09-05 03:05:57 -07:00
Alex Denisov
9b9dd3f9bf Unnecessary code removed 2012-09-05 11:44:47 +03:00
Dmitriy Zaporozhets
6e5cd8e081 Merge pull request #1375 from tsigo/discover_default_branch
Default branch auto-discovery
2012-09-05 00:04:56 -07:00
Dmitriy Zaporozhets
7c76c8d348 Merge pull request #1376 from AlexDenisov/remove_unused_routes
Unused routes removed
2012-09-04 23:59:43 -07:00
Alex Denisov
761c17f282 Unused routes removed 2012-09-05 09:20:02 +03:00
Dmitriy Zaporozhets
982a4095c1 Use tw style for some buttons. Improved deploy key UI 2012-09-05 08:56:59 +03:00
Robert Speicher
5e1c63d3f0 Move load_refs out of ApplicationController and into CommitsController
That was the only place it was used.
2012-09-05 01:13:41 -04:00
Robert Speicher
a9f275bc20 Fix load_refs in ApplicationController after default_branch change
As a last resort it was calling a method that didn't exist. Woops!
2012-09-05 01:12:44 -04:00
Robert Speicher
861a51488a Add specs for a couple more Repository methods used by discover_default_branch 2012-09-05 01:02:30 -04:00
Robert Speicher
443e23e61a Add Repository#discover_default_branch and add it to PushObserver 2012-09-05 01:01:20 -04:00
Robert Speicher
f06d98e907 Add SetDefaultBranchDefaultToNil migration
default_branch now defaults to nil, not 'master'. It will be set after the first
push by discover_default_branch.
2012-09-05 01:00:07 -04:00
Robert Speicher
36738897bf Add specs for Project#discover_default_branch 2012-09-05 00:54:00 -04:00
randx
42032956bd Cleaner install section for nginx, unicorn 2012-09-04 20:50:00 +03:00
randx
d59d2a197e cleanup gitlab from setup scripts 2012-09-04 20:29:20 +03:00
Dmitriy Zaporozhets
5ab3e38ecd Merge pull request #1371 from tsigo/project_panel
Refactor the project clone panel
2012-09-04 10:00:00 -07:00
randx
874a86f820 update install to use recipes 2012-09-04 19:44:17 +03:00
Robert Speicher
0bc4ecfedd Change projects/empty to include the clone_panel partial instead of duplicating 2012-09-04 12:05:21 -04:00
Robert Speicher
82a3996883 Remove projects/_show partial
I have no earthly idea what this file was for, but I couldn't find it being
rendered anywhere.
2012-09-04 12:05:21 -04:00
Robert Speicher
a463353773 Add "empty_repo?" method to Repository role
Replaces two calls that this method simplifies
2012-09-04 12:05:21 -04:00
Robert Speicher
7e76610d0a Update the projects js file to coffeescript; refactor the clone panel switcher 2012-09-04 12:05:20 -04:00
Robert Speicher
c1ff89fa2a Rename projects.js to projects.js.coffee 2012-09-04 11:30:49 -04:00
Dmitriy Zaporozhets
d6ea70c9b6 Merge pull request #1368 from tsigo/tmp_gitkeep
Add tmp/.gitkeep file to ensure tmp folder exists on clone
2012-09-04 03:03:37 -07:00
Dmitriy Zaporozhets
a48064c06e Merge pull request #1369 from tsigo/installation_doc
Clean up doc/installation.md
2012-09-04 03:03:24 -07:00
Robert Speicher
fc7ac316a0 Clean up doc/installation.md
Closes #939
2012-09-04 05:33:18 -04:00
Robert Speicher
11ebbb68d8 Add tmp/.gitkeep file to ensure tmp folder exists on clone
The install guide lists it as a requirement, so we might as well have it
by default.
2012-09-04 05:28:48 -04:00
Robert Speicher
12c57a7061 Change hardcoded base path to use Gitlab settings
Closes #1072
2012-09-04 05:05:56 -04:00
Valeriy Sizov
97ea041246 Merge pull request #1233 from robbytaylor/master
Changes to text in API documentation
2012-09-04 01:52:37 -07:00
Valeriy Sizov
e398e96b7c Merge pull request #1361 from tsechingho/master
use APP_ROOT in init-gitlab to specify root of project
2012-09-04 01:50:28 -07:00
Rob Taylor
4cb03183ac Text changes to API documentation 2012-09-04 09:48:33 +01:00
Tse-Ching Ho
457b0f604f use APP_ROOT in init-gitlab to specify root of project 2012-09-04 16:39:10 +08:00