Dmitriy Zaporozhets
1c2a7bc3cd
Merge pull request #3161 from cabello/patch-1
...
Refactor README to split production/development environments
2013-03-06 22:31:25 -08:00
Sato Hiroyuki
784aa266bd
Refactor: grouping parent and their space by including array.
2013-03-07 15:19:42 +09:00
Sato Hiroyuki
2f7f46b256
Refactor: replace "render :json = graph.to_json" to view template(show.json.erb).
...
Because model shouldn't know about view logic.
2013-03-07 15:19:32 +09:00
Danilo Cabello
3d662e5ccf
Refactor README to split production/development environments
2013-03-06 20:06:56 -05:00
Sebastian Ziebell
39114d259c
API: documentation contains infos to status codes in README file.
...
All the info to return codes from the API functions are available in the `README.md` file as suggested.
2013-03-07 00:15:57 +01:00
Pierre GUINOISEAU
67a61c80d1
Allow connection to Redis via unix socket
...
Allow connection to Redis via unix socket, using
unix:/var/run/redis/redis.sock for example.
Default behaviour does not change, except that the full Redis URL must
be configured, with redis:// for tcp or unix: for unix socket.
2013-03-06 22:06:12 +01:00
Dmitriy Zaporozhets
9dc46eee8e
Return project description back
2013-03-06 22:56:48 +02:00
Dmitriy Zaporozhets
7b38a0de98
show highlighted code correctly inside issue body
2013-03-06 21:48:15 +02:00
Dmitriy Zaporozhets
872cf404eb
fix js syntax error
2013-03-06 21:39:10 +02:00
Dmitriy Zaporozhets
19e9c736e7
add system hooks api docs to help content
2013-03-06 21:12:47 +02:00
Dmitriy Zaporozhets
08f29c322e
update Gemfile.lock with https rubygems
2013-03-06 21:10:01 +02:00
Dmitriy Zaporozhets
89ce02ea5d
Merge pull request #3158 from dosire/master
...
Use secure protocol
2013-03-06 10:22:45 -08:00
Sytse Sijbrandij
bcaf3c2c3e
Use secure protocol
2013-03-06 17:55:11 +01:00
Dmitriy Zaporozhets
afee5303ff
Merge pull request #3149 from m4tthumphrey/api-deploy-keys
...
Added methods to manage project deploy keys via API
2013-03-06 07:43:45 -08:00
Dmitriy Zaporozhets
65d78253cb
Merge pull request #3156 from m4tthumphrey/api-system-hooks
...
Added methods to manage system hooks from API
2013-03-06 07:42:43 -08:00
Dmitriy Zaporozhets
0384ef46b8
Merge pull request #3157 from cabello/patch-1
...
Update README with references to versions.
2013-03-06 07:37:07 -08:00
Dmitriy Zaporozhets
4c1538a946
Use redis as cache storage. cache events
2013-03-06 17:30:48 +02:00
Danilo Cabello
4db5ec281e
Update README with references to versions.
2013-03-06 10:20:46 -05:00
Matt Humphrey
1dd712ddc2
System hooks API.
2013-03-06 15:15:26 +00:00
Dmitriy Zaporozhets
40f1868194
Fix loading animation while browsing tree
2013-03-06 17:12:28 +02:00
Dmitriy Zaporozhets
e38e2ce29a
Merge pull request #3154 from hiroponz/fix-routing-error
...
Fix routing error
2013-03-06 05:08:09 -08:00
Sato Hiroyuki
83435e3d46
Adding sleep statements to allow sufficient time for the page to settle.
2013-03-06 16:36:11 +09:00
Sato Hiroyuki
e7a67a5583
Don't set format manually, bacause set in routing.
2013-03-06 16:36:10 +09:00
Sato Hiroyuki
bb63459d53
Fix routing errors.
...
It should fix #2598 .
2013-03-06 16:36:10 +09:00
Sato Hiroyuki
6224ac0647
Add and fix some tests for routing.
...
It is linked to #2598 .
2013-03-06 16:36:01 +09:00
Dmitriy Zaporozhets
d03af842c5
fix public projects identations
2013-03-06 09:12:14 +02:00
Angus MacArthur
47abdc10ca
Updated documentation for added Admin APIs
2013-03-05 23:48:40 -05:00
Sebastian Ziebell
b5ef6d2268
API: refactored and simplified error handling in merge requests API
2013-03-05 23:43:05 +01:00
Sebastian Ziebell
cce35b6d05
Fixes api
2013-03-05 22:33:45 +01:00
Sebastian Ziebell
61cfa2a7a6
Merge branch 'master' into fixes/api
...
Conflicts:
lib/api/projects.rb
2013-03-05 22:29:49 +01:00
Matt Humphrey
f411772e33
Project deploy keys API
2013-03-05 21:23:29 +00:00
Angus MacArthur
61ffcab60f
Additional Admin APIs
2013-03-05 10:38:43 -05:00
Dmitriy Zaporozhets
6beae84ea3
reduce letter-spacing for top nav
2013-03-05 17:28:13 +02:00
Dmitriy Zaporozhets
a99ad3d355
tree_heleper: concat html only if present. Avoid nil exception
2013-03-05 17:15:20 +02:00
Dmitriy Zaporozhets
9ba21dd0c4
better solution for #3027
2013-03-05 17:07:12 +02:00
Dmitriy Zaporozhets
d5663e148f
Merge pull request #2870 from mikew/relative-url-root-default
...
default gitlab.relative_url_root to ENV['RAILS_RELATIVE_URL_ROOT']
2013-03-05 06:54:31 -08:00
Dmitriy Zaporozhets
0c06b7fe20
Merge pull request #3106 from davidosomething/patch-1
...
Update doc/install/databases.md
2013-03-05 06:52:41 -08:00
Dmitriy Zaporozhets
3d45d300d8
Merge branch 'gliptak-omniauth_no_email_1'
2013-03-05 16:50:46 +02:00
Dmitriy Zaporozhets
2d2a235c06
fixed omniauth email spec
2013-03-05 16:50:37 +02:00
Dmitriy Zaporozhets
da6b53a80e
Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into gliptak-omniauth_no_email_1
...
Conflicts:
app/observers/user_observer.rb
spec/observers/user_observer_spec.rb
2013-03-05 16:48:18 +02:00
Dmitriy Zaporozhets
d5d9f1c515
Merge pull request #2015 from elvanja/commits-group-and-sort-by-date-desc
...
fix: grouping commits by date desc doesn't sort the groups too
2013-03-05 06:40:13 -08:00
Dmitriy Zaporozhets
c2ba868c9b
Merge pull request #2954 from cabeca/fix-image-url-emoji
...
Fix image url for emoji.
2013-03-05 05:52:01 -08:00
Dmitriy Zaporozhets
f22488f726
Merge pull request #3143 from Undev/state-machine-3
...
State machine 3
2013-03-05 05:38:16 -08:00
Dmitriy Zaporozhets
f9200e118c
remove custom font
2013-03-05 13:16:56 +02:00
Andrew8xx8
c6d6bd6ab4
Typo fixed
2013-03-05 14:29:44 +04:00
Dmitriy Zaporozhets
9bb35e7e59
Prevent app crash if team owner removed
2013-03-05 09:27:06 +02:00
Dmitriy Zaporozhets
3a09f02e11
Merge pull request #3109 from hiroponz/improve-network-graph
...
Improve network graph
2013-03-04 23:02:27 -08:00
J. Francisco Raposerias
a40541c42d
add autofocus to username input
2013-03-04 17:54:26 -03:00
Dmitriy Zaporozhets
bf06b3196d
Make clone widget read-only
2013-03-04 22:18:53 +02:00
Dmitriy Zaporozhets
730e79e787
better event-notes typography
2013-03-04 22:00:51 +02:00