Commit Graph
9518 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3bec6e8940 Merge branch 'fix-404-jquery-ui' into 'master'
Fix 404 jquery ui

Fixes #1211
2014-05-02 13:07:12 +00:00
Dmitriy Zaporozhets 0242124525 Fix 404 on jquery ui images
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 14:48:32 +03:00
Dmitriy Zaporozhets 87c397f577 More fixes to gitlab:shell:install
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 14:13:45 +03:00
Dmitriy Zaporozhets 59b81a6664 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-05-02 13:47:01 +03:00
Dmitriy Zaporozhets d74b8b450a Merge branch 'pkgr-improve-gitlab-shell-installation' 2014-05-02 13:46:44 +03:00
Dmitriy Zaporozhets dd47f9532f Fix gitlab-shell setup rake task
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 13:46:32 +03:00
Dmitriy Zaporozhets c883660a3e Fix install docs for gitlab-shell setup rake task
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 13:46:15 +03:00
Dmitriy Zaporozhets 85b5d203ac Merge branch 'improve-gitlab-shell-installation' of https://github.com/pkgr/gitlabhq into pkgr-improve-gitlab-shell-installation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/install/installation.md
2014-05-02 13:30:26 +03:00
Sytse Sijbrandij 4f8525d3b9 Merge branch 'update-release-dates' into 'master'
Update release dates
2014-05-02 10:26:22 +00:00
Dmitriy Zaporozhets b2a258722b Modify release dates for EE and CI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 13:23:12 +03:00
Dmitriy Zaporozhets 7660290b37 Merge pull request #6892 from cirosantilli/remove-signin-link-front-page
Remove redundant signin link from signin page.
2014-05-01 22:58:48 +03:00
Dmitriy Zaporozhets aedb20113d Merge pull request #6879 from arantir/patch-1
Typo fix
2014-05-01 22:51:56 +03:00
Dmitriy Zaporozhets d4b84d1677 Merge pull request #6906 from agjmills/patch-1
Updated CI error message so that it makes more sense
2014-05-01 22:50:04 +03:00
Alexander Mills cc9b7cba38 Updated CI error message so that it makes more sense 2014-05-01 15:42:28 +01:00
Dmitriy Zaporozhets d4b4088321 Merge pull request #6897 from cirosantilli/help-every-page
Add help link to header.
2014-05-01 11:58:55 +03:00
Ciro Santilli 469077e55d Add help link to header. 2014-05-01 09:14:52 +02:00
Dmitriy Zaporozhets 86726662e7 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-01 09:06:04 +03:00
Dmitriy Zaporozhets c258a28550 Merge branch 'notes-are-comments' into 'master'
Notes are comments
2014-04-30 18:37:11 +00:00
dosire 5bf12bbb1d Make clear that notes also serve as comments. 2014-04-30 17:28:05 +02:00
Sytse Sijbrandij 901fc30049 Merge branch 'forgot-import-readme' into 'master'
Forgot import readme

/cc @dzaporozhets
2014-04-30 13:03:41 +00:00
dosire 9571743d8f Import rake task documentation in separate file. 2014-04-30 15:02:42 +02:00
Sytse Sijbrandij a64724611f Merge branch 'import-check' into 'master'
Import check

/cc @dzaporozhets
2014-04-30 13:01:32 +00:00
dosire af2a39470f Make import docs more prominent. 2014-04-30 15:00:49 +02:00
Sytse Sijbrandij e284337307 Merge branch 'slack-doc-readme' into 'master'
Slack doc readme
2014-04-30 11:35:55 +00:00
dosire 193a9e7d4c Add link to slack docs. 2014-04-30 13:35:35 +02:00
Dmitriy Zaporozhets dc55127c1d Merge branch 'refresh_unless_hidden' into 'master'
Refresh Notes unless the tab is hidden
2014-04-29 18:02:33 +00:00
Jacob Vosmaer c8cf90d286 Add document.hidden improvement to CHANGELOG 2014-04-29 17:23:29 +02:00
Jacob Vosmaer 0b914e7ceb Refresh notes when the page becomes visible 2014-04-29 17:21:58 +02:00
Jacob Vosmaer e52f50c22f Do not refresh notes on hidden tabs 2014-04-29 17:21:58 +02:00
Dmitriy Zaporozhets 9eeb96846f Merge pull request #6877 from Nighoo/repository_push_email.text
do not html encode plaintext part of emails for push notifications
2014-04-29 18:07:55 +03:00
Dmitriy Zaporozhets dba913aa38 Merge pull request #6876 from dblessing/fix_broadcast_text
Fix unclear text in broadcast message view.
2014-04-29 18:07:26 +03:00
Ciro Santilli 513dbdbff3 Remove redundant signin link from signin page. 2014-04-29 11:49:42 +02:00
Dmitriy Zaporozhets c7dc20c120 Add new entries to CHANGELOG 2014-04-29 09:11:02 +02:00
Dmitriy Zaporozhets c51ac0484f Merge pull request #5962 from skv-headless/editing-preview
editing preview
2014-04-29 10:00:29 +03:00
Dmitriy Zaporozhets 3083753c39 Merge pull request #6891 from moul/patch-1
Added Node.js library link
2014-04-29 09:54:55 +03:00
Dmitriy Zaporozhets c8c9c365a0 Add apple-touch-icon-precomposed.png because of 404 on iOS devices 2014-04-29 08:28:03 +02:00
Dmitriy Zaporozhets 430562f3ca Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-04-29 08:00:00 +02:00
Dmitriy Zaporozhets f34f9a9ef3 Merge branch 'notes_finder_updated_at' into 'master'
NotesFinder filters by updated_at
2014-04-28 21:37:46 +00:00
Manfred Touron 274d6db187 Added Node.js library link 2014-04-28 22:20:33 +02:00
Jacob Vosmaer bd8b2b7fd9 Default last_fetched_at to 0 for old clients
Users who have not refreshed their browser tab will poll GitLab using
outdated JS. This change makes the server fall back to the old behavior
(send all comments) for old clients, instead of throwing an exception
for old clients.
2014-04-28 16:39:42 +02:00
Jacob Vosmaer c685024951 Add an index for Note#updated_at 2014-04-28 13:02:05 +02:00
Jacob Vosmaer 285926918b Serialize last_fetched_at as a string with seconds 2014-04-28 12:42:01 +02:00
Jacob Vosmaer 7ec5ff4dba Pass last_fetched_at for notes to javascript 2014-04-28 12:21:49 +02:00
Jacob Vosmaer bbfa4a771a Always set last_fetched_at in NotesFinder spec 2014-04-28 12:16:34 +02:00
Jacob Vosmaer 0b615eb0e2 Filter out old notes in NotesFinder 2014-04-28 12:13:29 +02:00
Jacob Vosmaer 7339464e77 Fail faster on an invalid target_type 2014-04-28 11:55:13 +02:00
Jacob Vosmaer e5cf5f4f98 Notes have noteables but no commits 2014-04-28 11:50:21 +02:00
Jacob Vosmaer 410790a355 Add NotesFinder spec 2014-04-28 11:48:18 +02:00
Job van der Voort f7da04dccd Merge pull request #6884 from xystudioo/master
fix init.d script copy duplication
2014-04-27 16:27:58 +02:00
Xiaoyu Tai 5ac015664d init.d script copy duplication
Copy init.d script twice in the guide. Deleted the second one.
2014-04-27 20:25:35 +08:00