Dmitriy Zaporozhets
13978f33d8
Merge pull request #2420 from koenpunt/patch-1
...
Remove wget dependency, now all curl
2013-01-16 05:20:24 -08:00
Dmitriy Zaporozhets
4c93d77f24
Merge pull request #2460 from calmh/expose-namespace
...
'namespace' should be exposed via the API
2013-01-16 05:05:45 -08:00
Dmitriy Zaporozhets
08426d336d
Merge pull request #2538 from jouve/app_helper
...
clean application_helper a bit
2013-01-16 04:59:29 -08:00
Dmitriy Zaporozhets
369dbaf396
Merge pull request #1586 from Bregor/ber_to_string
...
Auth: Net::BER::BerIdentifiedStrings to Strings
2013-01-16 04:55:52 -08:00
Dmitriy Zaporozhets
c9e6818ab6
Store repo satellites outside of tmp directory
2013-01-16 13:30:31 +02:00
Dmitriy Zaporozhets
3d57755b70
change roadmap
2013-01-15 22:54:03 +02:00
Dmitriy Zaporozhets
fd522b3257
should be green build now :)
2013-01-15 19:18:52 +02:00
Dmitriy Zaporozhets
cc54c66fd0
Fix spec/requests/notes_on_merge_requests_spec.r
2013-01-15 18:20:58 +02:00
Dmitriy Zaporozhets
cf353bd34f
Fixed spinach test
2013-01-15 17:12:53 +02:00
Dmitriy Zaporozhets
752eb2c11d
more tests fixed
2013-01-15 16:36:35 +02:00
Dmitriy Zaporozhets
b059de2ac7
Fix notes model specs
2013-01-15 15:19:14 +02:00
Dmitriy Zaporozhets
2191efd8ec
fix notes_on_wall specs
2013-01-15 15:04:22 +02:00
Dmitriy Zaporozhets
953db8477e
More fixes for test
2013-01-15 14:28:04 +02:00
Dmitriy Zaporozhets
211c06e419
Fix few test and notify for commit author
2013-01-15 13:37:20 +02:00
Dmitriy Zaporozhets
6ddacaf9bf
Merge branch 'riyad-discussions'
2013-01-15 12:43:09 +02:00
Dmitriy Zaporozhets
ac983319d3
fixing some test
2013-01-15 12:42:54 +02:00
Dmitriy Zaporozhets
f598cc7897
change logic on line_code
2013-01-15 11:12:17 +02:00
Riyad Preukschas
bda7fe38d0
Merge branch 'master' into discussions
2013-01-15 00:53:00 +01:00
Riyad Preukschas
d28176b132
Replace commit diff note request specs with spinach features
2013-01-15 00:52:57 +01:00
Riyad Preukschas
f8e1f4a7c9
Replace commit note request specs with spinach features
2013-01-15 00:52:55 +01:00
Riyad Preukschas
3022786948
Merge commit 'master' into discussions
...
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
Riyad Preukschas
8ee5fce9d6
Add preliminary specs for notes on merge requests
2013-01-15 00:27:59 +01:00
Riyad Preukschas
74e48f070f
Smaller fixes
2013-01-15 00:27:26 +01:00
Riyad Preukschas
d8e697ac68
Merge pull request #2585 from timl/patch-1
...
Fix typo in installation guide.
2013-01-14 13:21:26 -08:00
Dmitriy Zaporozhets
a36926216f
line numbers for blame
2013-01-14 20:55:57 +02:00
Dmitriy Zaporozhets
e98d478085
remove thin from production env. Use unicorn for foreman
2013-01-14 20:21:04 +02:00
Dmitriy Zaporozhets
b6da734824
Merge pull request #2584 from jasl8r/public-grack-clone
...
Public HTTP clones and remove auth request for public projects
2013-01-14 10:13:02 -08:00
Tim Laszlo
ba24e242d7
Update doc/install/installation.md
...
Change "th" to "the"
2013-01-14 09:28:33 -06:00
Jeremy Slater
80b8921a9a
Public HTTP clones and remove auth request for public projects
2013-01-14 09:46:55 -05:00
VonC
471b5910a6
Fix git group detection for gitolite ssh user.
...
The tasks gitlab:env:info mixes user and group, and presume as a group 'git'.
However, gitolite group name can be anything.
That patch add the git group name in the config,
and check gitolite.ssh_user group against git.group
(which defaults to 'git', as before this patch, if undefined).
M config/gitlab.yml.example:
Add 'group' in 'git' section
Mention default value for the two extra settings
M lib/tasks/gitlab/check.rake:
Check that gitolite.ssh_user *group* is the one defined in git.group.
Make sure to default to 'git' as the expected group
if said group is undefined in the config.
Note: uses a more complete regexp for the group detection
(the group can start, end or be in the middle or the list of groups
of gitolite.ssh_user)
M: config/initializers/1_settings.rb:
Add default values for gitolite.group and gitlab.user
2013-01-14 11:44:27 +00:00
Dmitriy Zaporozhets
eff6d3c12b
CHANGELOG for 4.1
2013-01-14 13:39:09 +02:00
Dmitriy Zaporozhets
23e338852c
Dont set @project variable in list. Remove a bit of duplication in dash and group
2013-01-14 10:09:01 +02:00
Dmitriy Zaporozhets
f716c0a1dd
profjects filter with_push to project model
2013-01-14 09:44:27 +02:00
Dmitriy Zaporozhets
8543313bf5
Few more filters for admin / projects
2013-01-14 09:37:29 +02:00
Dmitriy Zaporozhets
68bfcd0521
Add public filter to admin projects
2013-01-13 17:25:18 +02:00
Dmitriy Zaporozhets
122acb2254
fix unauth for public
2013-01-13 17:25:18 +02:00
Dmitriy Zaporozhets
4c6224aad1
Public git read-only access via http
2013-01-13 17:25:18 +02:00
Riyad Preukschas
eb626edd3f
Replace all stat command line calls with ruby equivalents
2013-01-12 01:25:01 +01:00
Riyad Preukschas
4d0af232da
Make method names clearer in check.rake
2013-01-12 01:24:57 +01:00
Riyad Preukschas
a213d4b9e8
Move OS detection to task helpers and add detection of OS X
2013-01-12 01:24:51 +01:00
Riyad Preukschas
fd836f5490
Update empty error messages and warn if not viewing the most recent wiki page
2013-01-11 21:04:21 +01:00
Riyad Preukschas
b55ed840e6
Update wiki pages
...
* Properly name columns in Pages and History views
* Link to Authors
* Make views more consistent
2013-01-11 20:20:11 +01:00
Riyad Preukschas
b3bfb75252
Fix link_to_member to not be bold by default
2013-01-11 20:16:37 +01:00
Riyad Preukschas
167f26b90d
Add an ordering scope to Wiki
2013-01-11 20:04:14 +01:00
Riyad Preukschas
5aada8cc2a
Move wiki delete button to the edit page
2013-01-11 20:03:43 +01:00
Riyad Preukschas
e54246d310
Merge pull request #2561 from MrHammy/master
...
Fix to pages links
2013-01-11 10:20:23 -08:00
Riyad Preukschas
f0c4e94d74
Move checks after init script installation in docs
2013-01-11 18:59:06 +01:00
David Southard
97a4e1b86a
update grammar in check application status section
2013-01-11 17:23:35 +01:00
MrHammy
c913f40ca4
Update app/views/wikis/pages.html.haml
...
Changed the link in the pages of the wiki to the direct link instead of the first created page
2013-01-11 13:40:29 +01:00
Dmitriy Zaporozhets
32dadb46fa
Merge pull request #2555 from studiofrenetic/master
...
Fix for archive download (method path missing)
2013-01-10 13:02:15 -08:00