Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make sure important directories exist in git | Robert Speicher | 2014-03-30 | 3 | -0/+0 |
* | Merge branch 'refactor_project_watchers_notifications' into 'master' | Dmitriy Zaporozhets | 2014-03-29 | 1 | -13/+33 |
|\ | |||||
| * | Refactor project watchers collecting. | Marin Jankovski | 2014-03-28 | 1 | -13/+33 |
* | | Merge pull request #6317 from jirutka/fix-ldap-dn-case | Dmitriy Zaporozhets | 2014-03-29 | 1 | -1/+6 |
|\ \ | |||||
| * | | Fix searching by extern_uid for LDAP to be case-insensitive | Jakub Jirutka | 2014-02-18 | 1 | -1/+6 |
* | | | Merge pull request #6644 from tombruijn/list-item-name-spacing | Dmitriy Zaporozhets | 2014-03-28 | 10 | -28/+48 |
|\ \ \ | |||||
| * | | | Improve alignment of labels in .well-list items | Tom de Bruijn | 2014-03-28 | 9 | -27/+42 |
| * | | | Clearfix on well-lists. Pages affected: | Tom de Bruijn | 2014-03-28 | 2 | -1/+6 |
* | | | | Merge remote-tracking branch 'origin/rake_drop_tables' | Dmitriy Zaporozhets | 2014-03-28 | 3 | -2/+14 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Drop all tables before restoring a PostgreSQL DB | Jacob Vosmaer | 2014-03-28 | 2 | -2/+4 |
| * | | | Add a rake task that drops all tables | Jacob Vosmaer | 2014-03-28 | 1 | -0/+10 |
| |/ / | |||||
* | | | Merge branch 'ldap_nickname' into 'master' | Dmitriy Zaporozhets | 2014-03-28 | 2 | -5/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Use omniauth nickname as the username for LDAP | Jacob Vosmaer | 2014-03-28 | 2 | -5/+2 |
|/ / | |||||
* | | Merge branch 'documentation/update_mr_contribution_section' into 'master' | Marin Jankovski | 2014-03-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Updated contribution guidelines to specify MRs should be to master. | Kyle Fazzari | 2014-03-27 | 1 | -1/+1 |
* | | | Merge pull request #6553 from tehZeno/patch-1 | Marin Jankovski | 2014-03-27 | 1 | -0/+3 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/gitlabhq/gitlabhq into patch-1 | Franz-Robert van Vugt | 2014-03-27 | 165 | -882/+1699 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge branch 'getting-help-on-website' into 'master' | Dmitriy Zaporozhets | 2014-03-27 | 1 | -19/+1 |
|\ \ \ \ | |||||
| * | | | | Move help to the website. | dosire | 2014-03-27 | 1 | -19/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'doc-readme-for-site' into 'master' | Dmitriy Zaporozhets | 2014-03-27 | 9 | -27/+66 |
|\ \ \ \ | |||||
| * | | | | New doc site needs indexes. | dosire | 2014-03-27 | 8 | -4/+37 |
| * | | | | Test the new doc index. | dosire | 2014-03-27 | 1 | -0/+7 |
| * | | | | Put important information at the top of the readme. | dosire | 2014-03-27 | 1 | -27/+26 |
* | | | | | Merge pull request #6395 from dpursehouse/grammar-fixes | Dmitriy Zaporozhets | 2014-03-27 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix another instance of "created at" | David Pursehouse | 2014-02-24 | 1 | -1/+1 |
* | | | | | | Merge pull request #6491 from esmail/patch-1 | Dmitriy Zaporozhets | 2014-03-27 | 1 | -0/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Database doc changes to address #2412 and #6451. | esmail | 2014-03-07 | 1 | -0/+7 |
* | | | | | | | Merge pull request #6634 from jvanbaarsen/see-merge-status-no-permission | Dmitriy Zaporozhets | 2014-03-27 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Always show merge status | Jeroen van Baarsen | 2014-03-27 | 1 | -1/+4 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2014-03-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'fix_architecture_img' into 'master' | Marin Jankovski | 2014-03-27 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | fix image not displaying in GitLab due to faulty markdown | Job van der Voort | 2014-03-27 | 1 | -2/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #6632 from blackst0ne/patch-1 | Sytse Sijbrandij | 2014-03-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Update permissions.md | blackst0ne | 2014-03-27 | 1 | -1/+1 |
* | | | | | | | Merge branch 'bugfix/153/500_when_create_issue' into 'master' | Dmitriy Zaporozhets | 2014-03-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Fixed 500 error when creating issue for project with no commits. | Kyle Fazzari | 2014-03-27 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #6610 from Datacom/feature/parallel_diff_scrollbars_pr2 | Marin Jankovski | 2014-03-27 | 4 | -71/+147 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactor Parallel Diff feature and add scrollbars | George Dewar | 2014-03-27 | 4 | -71/+147 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-03-27 | 1 | -5/+5 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'bugfix/fix_unicorn-sidekiq_confusion_in_gitlab_init_script' in... | Jacob Vosmaer | 2014-03-26 | 1 | -5/+5 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fixed Unicorn-Sidekiq confusion in GitLab init script. | Kyle Fazzari | 2014-03-08 | 1 | -5/+5 |
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-03-27 | 1 | -11/+11 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #6222 from nickryand/background_init | Jacob Vosmaer | 2014-03-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Removed the backgrounding of the unicorn_rails webapp start call. | Nick Downs | 2014-03-25 | 1 | -1/+1 |
| * | | | | | | | | Merge pull request #5879 from krzaczek/smartos-fix | Jacob Vosmaer | 2014-03-26 | 1 | -10/+10 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Init script - change start() stop() restart() reload() to xxxx_gitlab() | Pawel Krzaczkowski | 2014-03-26 | 1 | -10/+10 |
* | | | | | | | | | Merge branch 'ldap_check' into 'master' | Dmitriy Zaporozhets | 2014-03-27 | 1 | -1/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Ldap check recognize ldap user filter. | Marin Jankovski | 2014-03-26 | 1 | -1/+14 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'check-css' into 'master' | Dmitriy Zaporozhets | 2014-03-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Nice trick for css class check mentioned by Dmitriy. | dosire | 2014-03-25 | 1 | -0/+1 |