Dmitriy Zaporozhets
db10e6aaa6
Fix merge request model spec
2013-10-07 19:42:59 +03:00
Dmitriy Zaporozhets
eb7072de91
Fix avatar margin for files view
2013-10-07 16:56:02 +03:00
Dmitriy Zaporozhets
2db9410945
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-10-07 15:45:31 +03:00
Dmitriy Zaporozhets
bef632e816
Merge branch 'sidekiq_stop' of /home/git/repositories/gitlab/gitlabhq
2013-10-07 12:45:20 +00:00
Jacob Vosmaer
78b3fb769c
Run stopping commands in the foreground
2013-10-07 14:40:56 +02:00
Jacob Vosmaer
83e9825c97
Fix sudo commands in update guides
2013-10-07 14:16:04 +02:00
Dmitriy Zaporozhets
b658489f27
Fix bugs when discussion visible in wrong project
...
Because notes scope was not limited by project in
MergeRequest#mr_and_commit_notes it causes comments from project A
appears in discussions for MR in project B.
2013-10-07 14:49:01 +03:00
Dmitriy Zaporozhets
dc825ae330
Merge branch 'feature/api_remove_group' of /home/git/repositories/gitlab/gitlabhq
2013-10-07 11:32:25 +00:00
Dmitriy Zaporozhets
2eb76186f5
Merge pull request #5158 from tkoenig/fix-active-milestone-order
...
Sort active milestones by due date (upcoming first)
2013-10-07 03:35:09 -07:00
Dmitriy Zaporozhets
3db47d12f2
Merge branch 'check_hooks' of /home/git/repositories/gitlab/gitlabhq
2013-10-07 10:29:00 +00:00
Dmitriy Zaporozhets
93341579b6
Mention remove group api in CHANGELOG
2013-10-07 13:27:32 +03:00
Dmitriy Zaporozhets
1a18e778f5
Remove group api specs
2013-10-07 13:18:37 +03:00
Dmitriy Zaporozhets
f141711cfd
API: new feature - remove group
2013-10-07 13:10:01 +03:00
Jacob Vosmaer
99916fe159
Add troubleshooting hints to update hook check
2013-10-07 11:27:38 +02:00
Dmitriy Zaporozhets
073c8a2966
Merge pull request #5230 from cmckni3/patch-1
...
Fix invalid json in API docs
2013-10-06 22:44:03 -07:00
Dmitriy Zaporozhets
83c727c550
Merge pull request #5216 from bladealslayer/feature/flowdock_integration
...
Added Flowdock integration support via a service.
2013-10-04 08:00:51 -07:00
Dmitriy Zaporozhets
dc00562fa2
Merge branch 'satellite_merge' of /home/git/repositories/gitlab/gitlabhq
2013-10-04 13:26:49 +00:00
Marin Jankovski
a817993439
Remove outdated comments.
2013-10-04 13:26:48 +02:00
Dmitriy Zaporozhets
d3450ad2be
Merge branch 'improve_sidekiq_check' of /home/git/repositories/gitlab/gitlabhq
2013-10-04 11:24:27 +00:00
Dmitriy Zaporozhets
0223597aca
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2013-10-04 14:22:43 +03:00
Dmitriy Zaporozhets
499158a4d2
Merge branch 'requirements-cloud-experience' of /home/git/repositories/gitlab/gitlabhq
2013-10-04 11:17:12 +00:00
Marin Jankovski
fa7d75733c
Fix failed merge when filename is the same as target branchname.
2013-10-04 12:38:49 +02:00
Sytse Sijbrandij
363c5204d9
Better requirements based on the experience of GitLab Cloud.
2013-10-04 12:20:40 +02:00
Jacob Vosmaer
4017789f5a
Only kill sidekiqs belonging to gitlab user
2013-10-04 11:25:44 +02:00
Boyan Tabakov
e8b6974af3
Use gitlab-flowdock-git-hook patched for dependency on gitlab-grit, instead of grit.
...
Make sure the flowdock-git-hook is loaded. Seems it is not autoloader, due to the gem/lib name mismatch.
2013-10-03 16:36:43 +03:00
Jacob Vosmaer
e8b9712d89
Merge pull request #5262 from yatish27/master
...
Typo:Corrected the typo of sign-in in User Model
2013-10-03 06:21:05 -07:00
Jacob Vosmaer
37868d7bd6
Merge pull request #5160 from nummy/patch-1
...
Improve 6.0-to-6.1.md update guide
2013-10-03 06:17:27 -07:00
Yatish Mehta
9d622bd790
Typo:Corrected the typo of sign-in in User Model
2013-10-03 14:34:51 +05:30
Dmitriy Zaporozhets
1a6ba7e640
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2013-10-03 09:33:39 +03:00
Dmitriy Zaporozhets
62673d58ed
Merge branch 'update_api_documentation' of /home/git/repositories/gitlab/gitlabhq
2013-10-03 06:27:47 +00:00
Marin Jankovski
da54a1e644
Update group access levels in docs.
2013-10-02 16:41:01 +02:00
Dmitriy Zaporozhets
c44c5f5faa
Merge branch 'broader-message-matching' of /home/git/repositories/gitlab/gitlabhq
2013-10-02 14:14:49 +00:00
Dmitriy Zaporozhets
b0439a7802
Merge branch 'pg_installation' of /home/git/repositories/gitlab/gitlabhq
2013-10-02 14:14:09 +00:00
Dmitriy Zaporozhets
0cdb15b004
Merge branch 'new-site' of /home/git/repositories/gitlab/gitlabhq
2013-10-02 14:11:08 +00:00
Dmitriy Zaporozhets
3a1ab65e49
Merge branch 'add-backup-to-readme' of /home/git/repositories/gitlab/gitlabhq
2013-10-02 14:10:44 +00:00
Sytse Sijbrandij
a859723ef8
Add direct link to backup task and some other interfaces.
2013-10-02 15:02:54 +02:00
Sytse Sijbrandij
e58c81d643
Adapt readme to website redesign.
2013-10-02 14:43:11 +02:00
Marin Jankovski
d7ec7c794a
Removed user teams api docs.
2013-10-02 12:51:43 +02:00
Marin Jankovski
55880751aa
Update deploy keys, groups and system hooks api docs.
2013-10-02 12:50:01 +02:00
Marin Jankovski
f1253fa710
Update issues, milestones, notes api docs.
2013-10-02 12:08:07 +02:00
Marin Jankovski
5e96d07021
Update snippets and merge request api documentation
2013-10-02 11:04:51 +02:00
Jacob Vosmaer
45efba5801
Use mkdir -p in 4.2-to-5.0.md update guide
2013-10-02 10:28:01 +02:00
Jacob Vosmaer
58b46cbcf6
Add -H to sudo commands in 4.1-to-4.2.md
2013-10-02 09:29:40 +02:00
Sytse Sijbrandij
c9dd2ca64b
Correct spelling mistake.
2013-10-02 08:23:27 +02:00
Jacob Vosmaer
a3731cf362
Use peer-based authentication for PostgreSQL
2013-10-02 08:07:36 +02:00
Jacob Vosmaer
485162ec60
Streamline MySQL setup in installation.md
2013-10-02 08:07:36 +02:00
Marin Jankovski
f22e6c917d
Update project api docs.
2013-10-01 23:13:09 +02:00
Dmitriy Zaporozhets
970d86b7c5
Refactor blob finding
2013-10-01 20:34:41 +03:00
Dmitriy Zaporozhets
68d89548cd
Merge branch 'improve/gitlab_git_3' of /home/git/repositories/gitlab/gitlabhq
2013-10-01 16:12:56 +00:00
Dmitriy Zaporozhets
1d3f03fb69
Fix blob and repo stuff after gitlab_git v3
2013-10-01 18:26:55 +03:00
Dmitriy Zaporozhets
Jacob Vosmaer
Marin Jankovski
Sytse Sijbrandij
Boyan Tabakov
Yatish Mehta