Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix wikiuse-more-rugged | Dmitriy Zaporozhets | 2014-09-25 | 9 | -23/+40 |
* | Rollback diff drop and set default commit id to HEAD | Dmitriy Zaporozhets | 2014-09-25 | 2 | -2/+2 |
* | Decorate commit parents | Dmitriy Zaporozhets | 2014-09-25 | 3 | -4/+9 |
* | Improve diff and bump gitlab_git revision | Dmitriy Zaporozhets | 2014-09-24 | 3 | -4/+5 |
* | Use new version of gitlab_git with extended rugged usage | Dmitriy Zaporozhets | 2014-09-24 | 3 | -10/+16 |
* | Merge pull request #7823 from cirosantilli/test-fetch-shell | Dmitriy Zaporozhets | 2014-09-24 | 2 | -5/+10 |
|\ | |||||
| * | Only clone GitLab Shell on tests if necessary. | Ciro Santilli | 2014-09-22 | 2 | -5/+10 |
* | | Merge pull request #7820 from skv-headless/move_blame_to_rugged | Dmitriy Zaporozhets | 2014-09-24 | 2 | -11/+5 |
|\ \ | |||||
| * | | blame with rugged | skv | 2014-09-24 | 2 | -11/+5 |
| |/ | |||||
* | | Merge pull request #7816 from cirosantilli/factor-fork | Dmitriy Zaporozhets | 2014-09-24 | 2 | -8/+10 |
|\ \ | |||||
| * | | Factor fork button view. | Ciro Santilli | 2014-09-23 | 2 | -8/+10 |
* | | | Merge branch 'improve-protect-wording' into 'master' | Dmitriy Zaporozhets | 2014-09-24 | 1 | -6/+6 |
|\ \ \ | |||||
| * | | | Improve the wording explaining protected branches. | Sytse Sijbrandij | 2014-09-22 | 1 | -6/+6 |
| | |/ | |/| | |||||
* | | | Add fixes to changelog | Marin Jankovski | 2014-09-24 | 1 | -0/+3 |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-09-24 | 2 | -11/+7 |
|\ \ \ | |||||
| * \ \ | Merge pull request #7838 from cirosantilli/evaluate-exec | Robert Schilling | 2014-09-24 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | evaluate -> execute_script when return not needed. | Ciro Santilli | 2014-09-24 | 1 | -1/+1 |
| * | | | | Merge pull request #7837 from cirosantilli/go-back | Robert Schilling | 2014-09-24 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | evaluate_script history -> go_back and go_forward. | Ciro Santilli | 2014-09-24 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Merge pull request #7833 from cirosantilli/wiki-cur-url | Robert Schilling | 2014-09-23 | 1 | -8/+4 |
| |\ \ \ | |||||
| | * | | | Factor current_url + URI.path into current_path. | Ciro Santilli | 2014-09-23 | 1 | -8/+4 |
* | | | | | Merge branch 'jubianchi-api/improve-error-reporting' into 'master' | Dmitriy Zaporozhets | 2014-09-24 | 15 | -102/+369 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gi... | Dmitriy Zaporozhets | 2014-09-23 | 15 | -102/+369 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Improve error reporting on users API | jubianchi | 2014-09-16 | 15 | -103/+370 |
* | | | | | | Merge branch 'git-access-tests' into 'master' | Dmitriy Zaporozhets | 2014-09-24 | 1 | -0/+127 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactor Gitlab::GitAccess tests | Dmitriy Zaporozhets | 2014-09-24 | 1 | -119/+66 |
| * | | | | | | Add GitAccess specs | Dmitriy Zaporozhets | 2014-09-24 | 1 | -0/+180 |
|/ / / / / / | |||||
* | | | | | | Add notice about weekend in release cycle. | Sytse Sijbrandij | 2014-09-24 | 1 | -0/+4 |
|/ / / / / | |||||
* | | | | | Merge pull request #7521 from hiroponz/fix-not-rendered-graph-edge | Dmitriy Zaporozhets | 2014-09-23 | 1 | -3/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Fix not rendered the network graph edge. | Hiroyuki Sato | 2014-08-17 | 1 | -3/+7 |
* | | | | | | Merge pull request #7317 from drpdigitalmedia/master | Dmitriy Zaporozhets | 2014-09-23 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | set the collation to utf8_general_ci | Alexander Mills | 2014-08-13 | 1 | -0/+3 |
* | | | | | | | Merge pull request #7795 from cirosantilli/factor-notes-css | Dmitriy Zaporozhets | 2014-09-23 | 1 | -4/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Factor .add-diff-note active state. | Ciro Santilli | 2014-09-19 | 1 | -4/+7 |
* | | | | | | | | Merge pull request #7793 from cirosantilli/replace-javascript | Dmitriy Zaporozhets | 2014-09-23 | 5 | -15/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Replace javascript:; links with buttons. | Ciro Santilli | 2014-09-22 | 5 | -15/+18 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'search-wiki-keyword' into 'master' | Marin Jankovski | 2014-09-23 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Prevent 500 error on search results if description contains relative link | Dmitriy Zaporozhets | 2014-09-23 | 1 | -1/+6 |
* | | | | | | | | | Merge branch 'unicorn-timeout' into 'master' | Dmitriy Zaporozhets | 2014-09-23 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Increase unicorn timeout to 60 seconds | Dmitriy Zaporozhets | 2014-09-23 | 2 | -2/+2 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'fix-diff-500' into 'master' | Marin Jankovski | 2014-09-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix 500 error on diff if file permission changed | Dmitriy Zaporozhets | 2014-09-23 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'fix-mr-commit-comment' into 'master' | Marin Jankovski | 2014-09-23 | 2 | -3/+67 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix MR commenting system when new commits pushed | Dmitriy Zaporozhets | 2014-09-23 | 2 | -3/+67 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'fix_git_access' into 'master' | Marin Jankovski | 2014-09-23 | 2 | -5/+26 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix ref parsing in Gitlab::GitAccess | Jacob Vosmaer | 2014-09-23 | 2 | -5/+26 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Marin Jankovski | 2014-09-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge pull request #7692 from mr-vinn/fix-spec-rm | Jacob Vosmaer | 2014-09-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix invalid method in test | Vinnie Okada | 2014-09-22 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'monthly_doc' into 'master' | Sytse Sijbrandij | 2014-09-23 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | |