summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make sure important directories exist in gitRobert Speicher2014-03-303-0/+0
* Merge branch 'refactor_project_watchers_notifications' into 'master'Dmitriy Zaporozhets2014-03-291-13/+33
|\
| * Refactor project watchers collecting.Marin Jankovski2014-03-281-13/+33
* | Merge pull request #6317 from jirutka/fix-ldap-dn-caseDmitriy Zaporozhets2014-03-291-1/+6
|\ \
| * | Fix searching by extern_uid for LDAP to be case-insensitiveJakub Jirutka2014-02-181-1/+6
* | | Merge pull request #6644 from tombruijn/list-item-name-spacingDmitriy Zaporozhets2014-03-2810-28/+48
|\ \ \
| * | | Improve alignment of labels in .well-list itemsTom de Bruijn2014-03-289-27/+42
| * | | Clearfix on well-lists. Pages affected:Tom de Bruijn2014-03-282-1/+6
* | | | Merge remote-tracking branch 'origin/rake_drop_tables'Dmitriy Zaporozhets2014-03-283-2/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | Drop all tables before restoring a PostgreSQL DBJacob Vosmaer2014-03-282-2/+4
| * | | Add a rake task that drops all tablesJacob Vosmaer2014-03-281-0/+10
| |/ /
* | | Merge branch 'ldap_nickname' into 'master'Dmitriy Zaporozhets2014-03-282-5/+2
|\ \ \ | |/ / |/| |
| * | Use omniauth nickname as the username for LDAPJacob Vosmaer2014-03-282-5/+2
|/ /
* | Merge branch 'documentation/update_mr_contribution_section' into 'master'Marin Jankovski2014-03-281-1/+1
|\ \
| * | Updated contribution guidelines to specify MRs should be to master.Kyle Fazzari2014-03-271-1/+1
* | | Merge pull request #6553 from tehZeno/patch-1Marin Jankovski2014-03-271-0/+3
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/gitlabhq/gitlabhq into patch-1Franz-Robert van Vugt2014-03-27165-882/+1699
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'getting-help-on-website' into 'master'Dmitriy Zaporozhets2014-03-271-19/+1
|\ \ \ \
| * | | | Move help to the website.dosire2014-03-271-19/+1
| | |/ / | |/| |
* | | | Merge branch 'doc-readme-for-site' into 'master'Dmitriy Zaporozhets2014-03-279-27/+66
|\ \ \ \
| * | | | New doc site needs indexes.dosire2014-03-278-4/+37
| * | | | Test the new doc index.dosire2014-03-271-0/+7
| * | | | Put important information at the top of the readme.dosire2014-03-271-27/+26
* | | | | Merge pull request #6395 from dpursehouse/grammar-fixesDmitriy Zaporozhets2014-03-271-1/+1
|\ \ \ \ \
| * | | | | Fix another instance of "created at"David Pursehouse2014-02-241-1/+1
* | | | | | Merge pull request #6491 from esmail/patch-1Dmitriy Zaporozhets2014-03-271-0/+7
|\ \ \ \ \ \
| * | | | | | Database doc changes to address #2412 and #6451.esmail2014-03-071-0/+7
* | | | | | | Merge pull request #6634 from jvanbaarsen/see-merge-status-no-permissionDmitriy Zaporozhets2014-03-271-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Always show merge statusJeroen van Baarsen2014-03-271-1/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2014-03-271-2/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix_architecture_img' into 'master'Marin Jankovski2014-03-271-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | fix image not displaying in GitLab due to faulty markdownJob van der Voort2014-03-271-2/+2
| |/ / / / / /
* | | | | | | Merge pull request #6632 from blackst0ne/patch-1Sytse Sijbrandij2014-03-271-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update permissions.mdblackst0ne2014-03-271-1/+1
* | | | | | | Merge branch 'bugfix/153/500_when_create_issue' into 'master'Dmitriy Zaporozhets2014-03-271-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fixed 500 error when creating issue for project with no commits.Kyle Fazzari2014-03-271-1/+1
|/ / / / / /
* | | | | | Merge pull request #6610 from Datacom/feature/parallel_diff_scrollbars_pr2Marin Jankovski2014-03-274-71/+147
|\ \ \ \ \ \
| * | | | | | Refactor Parallel Diff feature and add scrollbarsGeorge Dewar2014-03-274-71/+147
| |/ / / / /
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-03-271-5/+5
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'bugfix/fix_unicorn-sidekiq_confusion_in_gitlab_init_script' in...Jacob Vosmaer2014-03-261-5/+5
| |\ \ \ \ \ \
| | * | | | | | Fixed Unicorn-Sidekiq confusion in GitLab init script.Kyle Fazzari2014-03-081-5/+5
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-271-11/+11
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #6222 from nickryand/background_initJacob Vosmaer2014-03-261-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Removed the backgrounding of the unicorn_rails webapp start call.Nick Downs2014-03-251-1/+1
| * | | | | | | | Merge pull request #5879 from krzaczek/smartos-fixJacob Vosmaer2014-03-261-10/+10
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Init script - change start() stop() restart() reload() to xxxx_gitlab()Pawel Krzaczkowski2014-03-261-10/+10
* | | | | | | | | Merge branch 'ldap_check' into 'master'Dmitriy Zaporozhets2014-03-271-1/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ldap check recognize ldap user filter.Marin Jankovski2014-03-261-1/+14
| |/ / / / / / / /
* | | | | | | | | Merge branch 'check-css' into 'master'Dmitriy Zaporozhets2014-03-261-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Nice trick for css class check mentioned by Dmitriy.dosire2014-03-251-0/+1