home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 22:16:15 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,743 Commits 48 Branches 340 Tags
475c554fdd68a9dd332891a100c094b543aa6a67
Commit Graph
11743 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Vosmaer 475c554fdd Merge branch 'sed_backlog' into 'master' 
Sed backlog

See merge request !1117
 2014-09-25 07:47:51 +00:00
Jacob Vosmaer b268fa0595 Fix the sed command for increasing the backlog 2014-09-25 09:34:29 +02:00
Dmitriy Zaporozhets 2aeac794c2 New entries for 7.4.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-24 19:46:42 +03:00
Dmitriy Zaporozhets 64a2afd3a4 Fix creating new file via web editor 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-24 19:30:58 +03:00
Dmitriy Zaporozhets 184e0f8df1 Fix non-showing error message when edit file via web 2014-09-24 19:15:37 +03:00
Sytse Sijbrandij de717a3335 Merge branch 'gitlab_ldap_filter' into 'master' 
Add more LDAP user_filter documentation

See merge request !1115
 2014-09-24 12:06:47 +00:00
Jacob Vosmaer 532eff6169 Add more LDAP user_filter documentation 2014-09-24 14:02:24 +02:00
Dmitriy Zaporozhets 28b6f09fcc Merge pull request #7823 from cirosantilli/test-fetch-shell 
Only clone GitLab Shell on tests if necessary.
 2014-09-24 12:58:10 +03:00
Dmitriy Zaporozhets 0b7377d86e Merge pull request #7820 from skv-headless/move_blame_to_rugged 
blame with rugged
 2014-09-24 12:55:40 +03:00
Dmitriy Zaporozhets 79a4da907d Merge pull request #7816 from cirosantilli/factor-fork 
Factor fork button view.
 2014-09-24 12:41:16 +03:00
Dmitriy Zaporozhets f0c0edc2a6 Merge branch 'improve-protect-wording' into 'master' 
Improve protect wording

See merge request !1103
 2014-09-24 09:39:09 +00:00
Marin Jankovski 5c908ba28c Add fixes to changelog 2014-09-24 11:29:47 +02:00
Dmitriy Zaporozhets b390ee1a83 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-24 12:27:10 +03:00
Dmitriy Zaporozhets 4d5435410f Merge branch 'jubianchi-api/improve-error-reporting' into 'master' 
Merge jubianchi-api/improve-error-reporting

Closes https://github.com/gitlabhq/gitlabhq/pull/7502

See merge request !1112
 2014-09-24 09:25:55 +00:00
Dmitriy Zaporozhets 7dba4ece66 Merge branch 'git-access-tests' into 'master' 
Gitlab::GitAccess tests

Fixes #1616

See merge request !1113
 2014-09-24 09:25:18 +00:00
Dmitriy Zaporozhets 15ba6ea105 Refactor Gitlab::GitAccess tests 2014-09-24 12:04:40 +03:00
Dmitriy Zaporozhets 3aa7132adc Add GitAccess specs 2014-09-24 11:37:30 +03:00
Robert Schilling b794fdbbbe Merge pull request #7838 from cirosantilli/evaluate-exec 
evaluate -> execute_script when return not needed.
 2014-09-24 10:28:15 +02:00
Robert Schilling b64702316d Merge pull request #7837 from cirosantilli/go-back 
evaluate_script history -> go_back and go_forward.
 2014-09-24 10:13:44 +02:00
Ciro Santilli b9c2e6ebdc evaluate -> execute_script when return not needed. 2014-09-24 10:03:51 +02:00
Ciro Santilli 4e89860826 evaluate_script history -> go_back and go_forward. 2014-09-24 09:51:27 +02:00
skv a286f92050 blame with rugged 2014-09-24 11:35:13 +04:00
Sytse Sijbrandij 8d7ed7e53b Add notice about weekend in release cycle. 2014-09-24 08:42:45 +02:00
Robert Schilling 6da15541d3 Merge pull request #7833 from cirosantilli/wiki-cur-url 
Factor current_url + URI.path into current_path.
 2014-09-23 22:14:17 +02:00
Ciro Santilli b095c1a44e Factor current_url + URI.path into current_path. 2014-09-23 21:56:38 +02:00
Ciro Santilli b5c0bdd7c9 Factor fork button view. 2014-09-23 21:16:27 +02:00
Dmitriy Zaporozhets d0e3ab5826 Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting 2014-09-23 21:35:45 +03:00
Dmitriy Zaporozhets 3c9ea7f4a9 Merge pull request #7521 from hiroponz/fix-not-rendered-graph-edge 
Fix not rendered the network graph edges
 2014-09-23 21:33:50 +03:00
Dmitriy Zaporozhets a8fc10e3d0 Merge pull request #7317 from drpdigitalmedia/master 
set the collation to utf8_general_ci
 2014-09-23 21:33:33 +03:00
Dmitriy Zaporozhets 66955bba38 Merge pull request #7795 from cirosantilli/factor-notes-css 
Factor .add-diff-note active state.
 2014-09-23 21:31:56 +03:00
Dmitriy Zaporozhets 6e328d5590 Merge pull request #7793 from cirosantilli/replace-javascript 
Replace javascript:; links with buttons.
 2014-09-23 21:28:35 +03:00
Marin Jankovski e5fb2ad908 Merge branch 'search-wiki-keyword' into 'master' 
Prevent 500 error on search results if description contains relative link

Bug: If I add relative link to comment or description and search for it - I get 500 error on search page.

Reason for this is that we use `@repository` variable. But for pages like search it does not assigned.
In future we should avoid using such variables. Especially in markdown parser that can be used on different pages

Fixes #1601

See merge request !1111
 2014-09-23 15:55:14 +00:00
Dmitriy Zaporozhets ea1eda2124 Merge branch 'unicorn-timeout' into 'master' 
Increase unicorn timeout

From 30 seconds to 60 seconds

Fixes #1579

See merge request !1110
 2014-09-23 15:18:05 +00:00
Marin Jankovski 2bb7a5bbea Merge branch 'fix-diff-500' into 'master' 
Fix 500 when viewing diff if a file changed permission

Fixes #1613

See merge request !1109
 2014-09-23 15:13:04 +00:00
Marin Jankovski 80b58184d3 Merge branch 'fix-mr-commit-comment' into 'master' 
Fix MR commenting system when new commits pushed

Fixes #1608

This conmmit fixes wierd behaviour when you see wrong comments about new
commits in merge requests.

Short explanation of a bug:
When you push new commits to project we updated `project.merge_requests`
with comment about push. But `project.merge_requests` includes also
merge requests from forks to origin project. So when you push to master
branch it commented on all merge requests from forks to origin where
source_branch was `master`

See merge request !1108
 2014-09-23 15:10:28 +00:00
Marin Jankovski e81fa0e66d Merge branch 'fix_git_access' into 'master' 
Fix ref parsing in Gitlab::GitAccess

See merge request !1107
 2014-09-23 15:02:06 +00:00
Marin Jankovski a33d7a4049 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-23 17:01:24 +02:00
Dmitriy Zaporozhets 1e980ffbad Prevent 500 error on search results if description contains relative link 2014-09-23 17:56:41 +03:00
Dmitriy Zaporozhets b083ab83ea Increase unicorn timeout to 60 seconds 2014-09-23 17:11:16 +03:00
Dmitriy Zaporozhets b897cc63a5 Fix 500 error on diff if file permission changed 2014-09-23 16:14:17 +03:00
Dmitriy Zaporozhets a5d23ae3c8 Fix MR commenting system when new commits pushed 
This conmmit fixes wierd behaviour when you see wrong comments about new
commits in merge requests.

Short explanation of a bug:
When you push new commits to project we updated `project.merge_requests`
with comment about push. But `project.merge_requests` includes also
merge requests from forks to origin project. So when you push to master
branch it commented on all merge requests from forks to origin where
source_branch was `master`
 2014-09-23 14:20:21 +03:00
Jacob Vosmaer f12d6278ed Fix ref parsing in Gitlab::GitAccess 2014-09-23 13:18:36 +02:00
Jacob Vosmaer d5c81a8d4a Merge pull request #7692 from mr-vinn/fix-spec-rm 
Use FileUtils to delete instead of File
 2014-09-23 11:23:47 +02:00
Sytse Sijbrandij e586ee347f Merge branch 'monthly_doc' into 'master' 
Add to monthly doc that reverting is an option

See merge request !1106
 2014-09-23 07:13:25 +00:00
Marin Jankovski 0f7cad07d0 Add to monthly doc that reverting a feature is an option. 2014-09-23 09:03:38 +02:00
Sytse Sijbrandij 0241efba59 Use origin to compare so it is not dependent on checking out the branch before. 2014-09-23 08:40:46 +02:00
Ciro Santilli 065ab3e5f3 Only clone GitLab Shell on tests if necessary. 2014-09-22 21:37:52 +02:00
Ciro Santilli 778afb699f Replace javascript:; links with buttons. 2014-09-22 21:01:19 +02:00
Dmitriy Zaporozhets 248990b5e8 Merge pull request #7772 from cirosantilli/resize-vertical 
[UI] Set textarea resize:vertical by default.
 2014-09-22 21:03:57 +03:00
Dmitriy Zaporozhets e54fdee436 Merge pull request #7657 from cirosantilli/factor-commit-list 
[refactor] Factor out commit list from compare and new MR.
 2014-09-22 21:03:29 +03:00