Commit graph

4747 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 5f159d4bc0 Merge pull request #3335 from zzet/patch-4
Update databases.md
2013-03-24 03:44:14 -07:00
Andrew Kumanyaev 4cc27fd9e1 Update database.yml.postgresql 2013-03-24 14:10:32 +04:00
Dmitriy Zaporozhets 38ea3939b2 Merge branch 'hiroponz-fix-404-json-file' 2013-03-24 12:01:56 +02:00
Dmitriy Zaporozhets 29b0ac489b move edit to separate controller. This fixes #3265 2013-03-24 11:57:44 +02:00
Andrew Kumanyaev 159cd0d742 Update databases.md 2013-03-24 13:48:23 +04:00
Dmitriy Zaporozhets b6641d6932 Merge branch 'fix-404-json-file' of https://github.com/hiroponz/gitlabhq into hiroponz-fix-404-json-file 2013-03-24 11:26:57 +02:00
Dmitriy Zaporozhets 979dcdba95 security update of crack gem 2013-03-24 11:24:26 +02:00
Sytse Sijbrandij 0d56b1b07f Updated links to gitlab.com and added the last doc files. 2013-03-23 21:20:09 +01:00
Sytse Sijbrandij c4f8d34b7d spelling error 2013-03-23 21:06:00 +01:00
Sytse Sijbrandij de3b181a69 5.0 should no longer be on the roadmap 2013-03-23 21:05:42 +01:00
Dmitriy Zaporozhets 77faffbda3 Merge pull request #3305 from dosire/update-ruby
Update ruby to latest version.
2013-03-22 11:04:00 -07:00
Sytse Sijbrandij 5cc5b74e8e Update ruby to latest version. 2013-03-22 18:34:59 +01:00
Dmitriy Zaporozhets e48fdde4f8 Merge pull request #3300 from aus/patch-1
Change gollum repo to use https:// instead of git://
2013-03-22 10:11:15 -07:00
Dmitriy Zaporozhets 747706a83a Merge pull request #3303 from dosire/attribute
Attribution as mentioned in https://news.ycombinator.com/item?id=5423635
2013-03-22 10:10:07 -07:00
Sytse Sijbrandij 78dd9a1481 All involved are mentioned. https://news.ycombinator.com/item?id=5424050 2013-03-22 17:54:42 +01:00
Dmitriy Zaporozhets c0da61c6d8 fix xss issue in blame 2013-03-22 18:52:25 +02:00
Sytse Sijbrandij 3869cfecc1 Use real name. 2013-03-22 17:42:31 +01:00
Sytse Sijbrandij ccc8806758 Attribution as mentioned in https://news.ycombinator.com/item?id=5423635 2013-03-22 17:39:22 +01:00
Austin Robertson ba1dbd39fb Change Gemfile.lock repo to use https:// 2013-03-22 10:38:27 -05:00
Austin Robertson 693dcce6bc Change gollum repo to use https:// instead of git://
A lot of people might have firewalls blocking the git:// protocol. Using https:// makes this easier and matches the other git repositories in the Gemfile.
2013-03-22 10:31:19 -05:00
Dmitriy Zaporozhets de2c189ec1 fix blame view head nav 2013-03-22 15:11:16 +02:00
Dmitriy Zaporozhets 84043e8e44 Fix lines and line numbers being squashed in File -> blame 2013-03-22 15:08:02 +02:00
Dmitriy Zaporozhets 235605fc6d Merge pull request #3288 from hiroponz/fix-style-network-graph
Fix style of network graph.
2013-03-22 00:43:26 -07:00
Sato Hiroyuki f5e001bd8c Using arrowed line only if it connects to not first parent.
It is easy to see which branch is merged.
2013-03-22 16:09:21 +09:00
Sato Hiroyuki 26606aa2ec Fix style of network graph.
refs #3258
2013-03-22 10:11:53 +09:00
Dmitriy Zaporozhets 5f9d654939 Dont show '0 additions and 0 deletions' message for commit 2013-03-21 22:50:18 +02:00
Dmitriy Zaporozhets ad5ea14210 Move commit.show partial from commits/ to commit/ 2013-03-21 22:22:54 +02:00
Dmitriy Zaporozhets fec283889b fix commit-description css on commit.show 2013-03-21 22:22:21 +02:00
Dmitriy Zaporozhets c4299bb45a Move directory logic out of model. Use Gitlab:Shell class to interact with file system 2013-03-21 22:11:08 +02:00
Dmitriy Zaporozhets 0103363191 replace Gitolited mixin with Gitlab::ShellAdapter 2013-03-21 21:01:14 +02:00
Dmitriy Zaporozhets d6338a8482 Merge pull request #3258 from hiroponz/display-commit-msg
Display commit message on network graph.
2013-03-21 09:58:57 -07:00
Sato Hiroyuki 06c5389780 Fix travis failure randomly, because Capybara.default_wait_time is too short. 2013-03-21 15:24:06 +00:00
Sato Hiroyuki a1fe375e44 Fix 404 error while displaying json files.
It uses params[:id] instead of request.fullpath.
It should fix #3132.
2013-03-21 15:10:14 +00:00
Dmitriy Zaporozhets 02f70851e4 Update readme to match 5-0-stable 2013-03-21 16:29:53 +02:00
GitLab f7ca6c5079 Version up to 5.0.0 2013-03-21 15:20:17 +02:00
Sato Hiroyuki a19e3d898d Display icon and commit message on network graph. 2013-03-21 13:08:54 +00:00
Sato Hiroyuki 916c61fc64 Refactor: clean up code. 2013-03-21 12:34:15 +00:00
Dmitriy Zaporozhets 0df01283b0 Merge pull request #3276 from DarthJDG/fix-group-typo
Fix column heading order in group admin view
2013-03-21 00:15:57 -07:00
Robert Biro f39d3b9a09 Fix column heading order in group admin view 2013-03-20 22:15:42 +00:00
Dmitriy Zaporozhets 3cdac0b934 Use Api.js to handle api calls to gitlab 2013-03-20 21:55:25 +02:00
Dmitriy Zaporozhets a163135cb5 Intead of showing 404 give users ability to close MR with missing branches 2013-03-20 20:22:29 +02:00
Dmitriy Zaporozhets a0cc38827f remove db:setup & seed_fu from install docs. gitlab:setup does it 2013-03-20 19:30:59 +02:00
Dmitriy Zaporozhets c71a7896b1 fix test button functionality for project -> service -> gitlab ci 2013-03-20 16:41:59 +02:00
Sato Hiroyuki 1f6b6b6c62 Rotating graph orientation. 2013-03-20 12:28:22 +00:00
Dmitriy Zaporozhets 9d06074409 gitlab 5.0 rc1 2013-03-20 13:49:32 +02:00
Dmitriy Zaporozhets 3d9bd6e3e7 fix gfm helper test 2013-03-20 13:41:18 +02:00
Dmitriy Zaporozhets 51b1859e49 fix key observer test 2013-03-20 10:25:11 +02:00
Dmitriy Zaporozhets 6347e9a60b Dont load diff in compare over 100 commits 2013-03-20 10:19:00 +02:00
Dmitriy Zaporozhets 72db22d385 send wall message with crtl+enter 2013-03-20 09:53:39 +02:00
Dmitriy Zaporozhets 316cf61965 Merge pull request #3247 from Undev/feature/fix_bug_in_team_assigment
Fix bug with downgrade permissions on first project assigment to team
2013-03-20 00:35:24 -07:00