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 |
|
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 |
|
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 |
|
Dmitriy Zaporozhets
|
d54845a16a
|
use md-typography for note content
|
2013-03-04 21:34:26 +02:00 |
|
Dmitriy Zaporozhets
|
dc7507cfe7
|
= preserve do was ignored for empty project page so was replaced with filter
|
2013-03-04 21:12:36 +02:00 |
|
Dmitriy Zaporozhets
|
533693ab41
|
Fix dark color bg for wiki
|
2013-03-04 21:11:03 +02:00 |
|
Dmitriy Zaporozhets
|
24cc0faf2c
|
add link ti public area
|
2013-03-04 20:11:23 +02:00 |
|
Dmitriy Zaporozhets
|
c2082f4d78
|
Fix edit team page
|
2013-03-04 19:47:20 +02:00 |
|
Andrew8xx8
|
0d9a6fe7b1
|
User's blocked field refactored to use state machine
|
2013-03-04 18:52:30 +04:00 |
|
Andrew8xx8
|
9a06dd4aa1
|
Migrations added
|
2013-03-04 18:51:00 +04:00 |
|
Sato Hiroyuki
|
95b826071f
|
Add some tests for network graph
|
2013-03-04 17:50:42 +09:00 |
|
Dmitriy Zaporozhets
|
152c6018b3
|
use grit_ext gem instead of fork
|
2013-03-04 08:56:54 +02:00 |
|
Dmitriy Zaporozhets
|
d199de0444
|
Use gitlab-pygments gem
|
2013-03-04 08:54:00 +02:00 |
|
Dmitriy Zaporozhets
|
282b804556
|
use gitlab-grack gem
|
2013-03-03 22:08:04 +02:00 |
|
Dmitriy Zaporozhets
|
512ab1b61a
|
Use gem for gitlab grit
|
2013-03-03 22:01:20 +02:00 |
|
Dmitriy Zaporozhets
|
4635ad83e6
|
Merge pull request #3126 from dosire/refer-to-vagrant-vm
Refer to virtual machine from the installation document.
|
2013-03-03 08:36:26 -08:00 |
|
Dmitriy Zaporozhets
|
5a80a28a18
|
Merge pull request #3123 from wtw/patch-1
Corrected some typos in gitlab.yml.example comments
|
2013-03-03 08:35:27 -08:00 |
|
Dmitriy Zaporozhets
|
891dc550e0
|
README code in lists
|
2013-03-03 18:22:56 +02:00 |
|
Dmitriy Zaporozhets
|
06807885cf
|
fix readme code nesting
|
2013-03-03 18:21:36 +02:00 |
|
Dmitriy Zaporozhets
|
bb7490771e
|
Use proper markdown syntax for code in README.md
|
2013-03-03 17:51:24 +02:00 |
|
Dmitriy Zaporozhets
|
69159634d6
|
Merge pull request #3125 from dosire/development-doc-in-repo
Development doc in repo
|
2013-03-03 07:48:25 -08:00 |
|
Sytse Sijbrandij
|
50620b7df8
|
Refer to virtual machine from the installation document.
|
2013-03-03 12:38:01 +01:00 |
|
Sytse Sijbrandij
|
6e908f1a36
|
Sidekiq replaced resque.
|
2013-03-03 12:29:57 +01:00 |
|
Sytse Sijbrandij
|
5421f6b239
|
Small fixes and better quoting.
|
2013-03-02 23:38:48 +01:00 |
|
Sytse Sijbrandij
|
56d1cc5be5
|
Replacing the development guide.
|
2013-03-02 23:27:52 +01:00 |
|
Dmitriy Zaporozhets
|
5b4032d175
|
Merge pull request #3118 from 2called-chaos/dont_send_mails_twice
Do not send issue status mail twice if author = assignee
|
2013-03-02 10:48:22 -08:00 |
|
Dmitriy Zaporozhets
|
62562e4d0d
|
Merge pull request #3119 from m4tthumphrey/patch-1
Add namespace_id to project creation via API
|
2013-03-02 10:47:19 -08:00 |
|
Dmitriy Zaporozhets
|
bd3848c05b
|
Merge pull request #3124 from dosire/comprehensive-readme
Cleaned up and enhanced readme.
|
2013-03-02 10:45:38 -08:00 |
|
Sytse Sijbrandij
|
737a449795
|
Cleaned up and enhanced readme.
Finishing touches.
Make the layout more consistent.
|
2013-03-02 13:04:57 +01:00 |
|
Dmitriy Zaporozhets
|
907c334fe0
|
fix decorate call for milestone users
|
2013-03-02 13:23:30 +02:00 |
|
Dmitriy Zaporozhets
|
86da625f1d
|
Updated gems: omniauth, sinatra, foreman
|
2013-03-02 12:58:47 +02:00 |
|
wtw
|
1c8c5c76b6
|
Corrected some typos in gitlab.yml.example comments
|
2013-03-01 23:53:37 +01:00 |
|
Matt Humphrey
|
1c0c7bd6e3
|
Missed comma.
|
2013-03-01 16:36:19 +00:00 |
|