Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Split merge conflict messages on 2 linesnicer-merge-conflicts-widget | Dmitriy Zaporozhets | 2015-08-06 | 1 | -1/+2 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'add-current-user-to-autocomplete' into 'master' | Dmitriy Zaporozhets | 2015-08-06 | 4 | -2/+28 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Always add current user to autocomplete controller to support filter by "Me" | Stan Hu | 2015-08-06 | 4 | -2/+28 | |
* | | | | | | | | | Merge branch 'fix-namespace-move-dir' into 'master' | Dmitriy Zaporozhets | 2015-08-06 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Ensure old namespace directory exists before moving itfix-namespace-move-dir | Dmitriy Zaporozhets | 2015-08-06 | 1 | -0/+3 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'report-spam' | Dmitriy Zaporozhets | 2015-08-06 | 19 | -1/+231 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove trailing linesreport-spam | Dmitriy Zaporozhets | 2015-08-06 | 1 | -2/+0 | |
| * | | | | | | | | | Add tests for abuse report feature | Dmitriy Zaporozhets | 2015-08-06 | 5 | -0/+67 | |
| * | | | | | | | | | Improve wording in abuse report form | Dmitriy Zaporozhets | 2015-08-06 | 2 | -5/+4 | |
| * | | | | | | | | | Remove selectbox from abuse form. Added pagination in admin area | Dmitriy Zaporozhets | 2015-08-06 | 2 | -5/+3 | |
| * | | | | | | | | | Add abuse report management in admin area | Dmitriy Zaporozhets | 2015-08-06 | 5 | -0/+58 | |
| * | | | | | | | | | Allow users to send abuse reports | Dmitriy Zaporozhets | 2015-08-06 | 10 | -1/+111 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'project-name' into 'master' | Dmitriy Zaporozhets | 2015-08-06 | 4 | -3/+14 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix spec | Douwe Maan | 2015-08-06 | 1 | -2/+2 | |
| * | | | | | | | | Add project name to project head | Douwe Maan | 2015-08-06 | 3 | -1/+12 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'update_changelog_from_stable' into 'master' | Valery Sizov | 2015-08-06 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | update chnagelogupdate_changelog_from_stable | Valery Sizov | 2015-08-05 | 1 | -0/+3 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'fix-link-to-guide' into 'master' | Douwe Maan | 2015-08-06 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Replace relative url with full path, remove old reference for indexes | Achilleas Pipinellis | 2015-08-05 | 1 | -2/+2 | |
* | | | | | | | | Merge branch 'remove-email-from-published-keys' into 'master' | Douwe Maan | 2015-08-06 | 6 | -7/+33 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Only publish ssh key-type and key | Zeger-Jan van de Weg | 2015-08-04 | 6 | -7/+33 | |
* | | | | | | | | | Merge branch 'tree-author-at-end' into 'master' | Dmitriy Zaporozhets | 2015-08-06 | 2 | -6/+5 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Put author name at the end of a tree row | Sven Strickroth | 2015-08-05 | 2 | -6/+5 | |
* | | | | | | | | | | Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master' | Douwe Maan | 2015-08-06 | 5 | -4/+37 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix "Network" and "Graphs" pages for branches with encoded slashes | Stan Hu | 2015-08-02 | 3 | -1/+12 | |
| * | | | | | | | | | Fix errors deleting and creating branches with encoded slashes | Stan Hu | 2015-08-01 | 3 | -3/+25 | |
* | | | | | | | | | | Update stable branch in installation documentation. Fixes #2191 | Achilleas Pipinellis | 2015-08-05 | 1 | -2/+2 | |
* | | | | | | | | | | Merge branch 'drop-satellites' | Dmitriy Zaporozhets | 2015-08-05 | 68 | -1069/+288 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove satellites from requirements docs and add CHANGELOGdrop-satellites | Dmitriy Zaporozhets | 2015-08-05 | 2 | -2/+4 | |
| * | | | | | | | | | | Fix merge request creation without branch selected | Dmitriy Zaporozhets | 2015-08-05 | 2 | -7/+7 | |
| * | | | | | | | | | | Improve tests to use real branches in merge requests | Dmitriy Zaporozhets | 2015-08-04 | 4 | -13/+13 | |
| * | | | | | | | | | | Merge branch 'master' into drop-satellites | Dmitriy Zaporozhets | 2015-08-04 | 220 | -1477/+2983 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Fix merge api and spec | Dmitriy Zaporozhets | 2015-08-04 | 2 | -15/+13 | |
| * | | | | | | | | | | Remove satellites mention from architecture doc | Dmitriy Zaporozhets | 2015-07-16 | 1 | -3/+3 | |
| * | | | | | | | | | | Use real branches from test repo | Dmitriy Zaporozhets | 2015-07-16 | 1 | -4/+4 | |
| * | | | | | | | | | | Fix some of tests | Dmitriy Zaporozhets | 2015-07-16 | 3 | -4/+4 | |
| * | | | | | | | | | | Fix refresh service | Dmitriy Zaporozhets | 2015-07-16 | 1 | -1/+1 | |
| * | | | | | | | | | | Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix ... | Dmitriy Zaporozhets | 2015-07-16 | 2 | -6/+5 | |
| * | | | | | | | | | | Huge refactoring for accepting merge requests | Dmitriy Zaporozhets | 2015-07-16 | 20 | -133/+139 | |
| * | | | | | | | | | | Refactor compare and fetch logic | Dmitriy Zaporozhets | 2015-07-15 | 8 | -51/+36 | |
| * | | | | | | | | | | Implement update of ref when merge request code is reloaded | Dmitriy Zaporozhets | 2015-07-15 | 1 | -9/+18 | |
| * | | | | | | | | | | Implement merge from forks without satellites | Dmitriy Zaporozhets | 2015-07-15 | 7 | -22/+62 | |
| * | | | | | | | | | | Fix application initialize | Dmitriy Zaporozhets | 2015-07-15 | 2 | -1/+5 | |
| * | | | | | | | | | | Remove satellites | Dmitriy Zaporozhets | 2015-07-15 | 35 | -844/+18 | |
| * | | | | | | | | | | Fetch reference from fork repo when create merge request | Dmitriy Zaporozhets | 2015-07-15 | 2 | -0/+14 | |
* | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-08-05 | 2 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'update_release_doc' into 'master' | Dmitriy Zaporozhets | 2015-08-05 | 2 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | update release doc | Valery Sizov | 2015-08-05 | 2 | -0/+2 | |
| | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2015-08-05 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'server-note' into 'master' | Job van der Voort | 2015-08-05 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ |