Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace turbolink spinner with nprogress | Dmitriy Zaporozhets | 2014-03-19 | 6 | -12/+7 |
* | Merge pull request #6558 from tsigo/master | Dmitriy Zaporozhets | 2014-03-19 | 1 | -2/+2 |
|\ | |||||
| * | Fix travis setup | Robert Speicher | 2014-03-18 | 1 | -2/+2 |
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-03-19 | 12 | -1/+321 |
|\ \ | |||||
| * \ | Merge pull request #6550 from razielgn/slack-integration | Dmitriy Zaporozhets | 2014-03-19 | 11 | -1/+320 |
| |\ \ | | |/ | |/| | |||||
| | * | Added Slack service integration. | Federico Ravasio | 2014-03-18 | 11 | -1/+320 |
| |/ | |||||
| * | Merge pull request #5993 from DarkHorseComics/bypass-commented-sqlite | Jacob Vosmaer | 2014-03-18 | 1 | -0/+1 |
| |\ | |||||
| | * | Add more descriptive line for resolving sqlite error during check | Jamey J. DeOrio | 2014-03-17 | 1 | -0/+1 |
* | | | Merge branch 'ldap_password' into 'master' | Dmitriy Zaporozhets | 2014-03-18 | 2 | -1/+19 |
|\ \ \ | |/ / |/| | | |||||
| * | | Do not allow password reset for ldap user. | Marin Jankovski | 2014-03-18 | 2 | -1/+19 |
|/ / | |||||
* | | Merge branch 'check_orphaned_users_groups' into 'master' | Dmitriy Zaporozhets | 2014-03-18 | 1 | -0/+14 |
|\ \ | |/ |/| | |||||
| * | Drop UsersGroup orphans using `rails runner` | Jacob Vosmaer | 2014-03-17 | 1 | -0/+4 |
| * | Add check for orphaned UsersGroups | Jacob Vosmaer | 2014-03-14 | 1 | -0/+10 |
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Marin Jankovski | 2014-03-17 | 1 | -4/+4 |
|\ \ | |||||
| * \ | Merge pull request #6529 from MrKeiKun/system-hook-fix | Sytse Sijbrandij | 2014-03-17 | 1 | -4/+4 |
| |\ \ | |||||
| | * | | Fixed some minor typos. | Kei | 2014-03-16 | 1 | -4/+4 |
* | | | | Add change to changelog. | Marin Jankovski | 2014-03-17 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge branch 'links_within_same_repo' into 'master' | Dmitriy Zaporozhets | 2014-03-17 | 5 | -27/+50 |
|\ \ \ | |||||
| * | | | Update markdown documentation, fix wiki spec. | Marin Jankovski | 2014-03-17 | 2 | -15/+38 |
| * | | | Update wiki tests. | Marin Jankovski | 2014-03-17 | 1 | -6/+5 |
| * | | | Wiki will show relative links related to the wiki gollum repository. | Marin Jankovski | 2014-03-17 | 2 | -4/+5 |
| * | | | Link to blob instead of linking to wiki. | Marin Jankovski | 2014-03-17 | 1 | -2/+2 |
* | | | | Merge branch 'mysql-to-og' into 'master' | Dmitriy Zaporozhets | 2014-03-17 | 1 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | Postgresql conversion script. | dosire | 2014-03-17 | 1 | -0/+9 |
* | | | | | Default value for Snippet#private | Dmitriy Zaporozhets | 2014-03-17 | 1 | -0/+2 |
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-03-17 | 2 | -0/+17 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #6544 from cirosantilli/show-link-to-public-projects-for-n... | Dmitriy Zaporozhets | 2014-03-17 | 2 | -0/+17 |
| |\ \ \ \ \ | |||||
| | * | | | | | Show link to public projects for new users. | Ciro Santillli | 2014-03-17 | 2 | -0/+17 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | Merge branch 'deeplink' into 'master' | Sytse Sijbrandij | 2014-03-17 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | We have html targets for paragraphs now. | dosire | 2014-03-17 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'project-permissions' into 'master' | Dmitriy Zaporozhets | 2014-03-17 | 6 | -20/+72 |
|\ \ \ \ \ | |||||
| * | | | | | Fix tests | Dmitriy Zaporozhets | 2014-03-17 | 1 | -1/+1 |
| * | | | | | Add more api docs | Dmitriy Zaporozhets | 2014-03-17 | 1 | -0/+10 |
| * | | | | | Add tests for API project permissions info | Dmitriy Zaporozhets | 2014-03-17 | 2 | -1/+26 |
| * | | | | | Remove old entities | Dmitriy Zaporozhets | 2014-03-17 | 1 | -12/+0 |
| * | | | | | Add current user permissions info to /api/projects/:id.json | Dmitriy Zaporozhets | 2014-03-17 | 2 | -2/+24 |
| * | | | | | Use new grape-entity gem with fixed nested entities | Dmitriy Zaporozhets | 2014-03-17 | 2 | -5/+12 |
* | | | | | | Merge branch 'split-api-files' into 'master' | Dmitriy Zaporozhets | 2014-03-17 | 6 | -256/+271 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Move project members api to separate file | Dmitriy Zaporozhets | 2014-03-17 | 6 | -256/+271 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-03-17 | 1 | -0/+12 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'update/changelog' into 'master' | Sytse Sijbrandij | 2014-03-17 | 1 | -0/+12 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | update changelog, add remainder 6.6.X changlog entries | Arif Ali | 2014-03-17 | 1 | -0/+12 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-03-17 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #6534 from dlorch/master | Dmitriy Zaporozhets | 2014-03-17 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | JIRA project identifiers may also contain dashes '-' | Daniel Lorch | 2014-03-14 | 1 | -1/+1 |
| | | |_|/ | | |/| | | |||||
* | | | | | Restore old travis.yml | Dmitriy Zaporozhets | 2014-03-17 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Merge branch 'gmessner/gitlab-ce-issue-110' | Dmitriy Zaporozhets | 2014-03-16 | 3 | -3/+13 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into gmessn... | Dmitriy Zaporozhets | 2014-03-16 | 3 | -3/+13 |
| |\ \ \ \ |/ / / / / | |||||
| * | | | | Added tests of Create and Update MR description. | Greg Messner | 2014-03-10 | 1 | -1/+8 |
| * | | | | Added description parameter support to Create and Update MR API endpoints (is... | Greg Messner | 2014-03-03 | 2 | -2/+5 |