Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'importing-fix' into 'master' | Job van der Voort | 2015-06-08 | 8 | -9/+41 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | fix spacing in document | Job van der Voort | 2015-06-08 | 1 | -8/+5 | |
| * | | | importing documents renewed | Job van der Voort | 2015-06-08 | 8 | -9/+44 | |
|/ / / | ||||||
* | | | Merge branch 'master' into 'master' | Sytse Sijbrandij | 2015-06-06 | 1 | -1/+3 | |
|\ \ \ | ||||||
| * | | | Changed spelling | rugk | 2015-06-06 | 1 | -1/+1 | |
| * | | | Escaped(?) | rugk | 2015-06-05 | 1 | -1/+1 | |
| * | | | Added free alternative to Google Authenticator (FreeOTP). | rugk | 2015-06-05 | 1 | -1/+3 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'cleaner-project-page' into 'master' | Dmitriy Zaporozhets | 2015-06-05 | 1 | -5/+3 | |
|\ \ \ | ||||||
| * | | | Remove line under project description | Dmitriy Zaporozhets | 2015-06-05 | 1 | -5/+3 | |
|/ / / | ||||||
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Jacob Vosmaer | 2015-06-05 | 4 | -17/+16 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'header-50-px' into 'master' | Dmitriy Zaporozhets | 2015-06-05 | 4 | -17/+16 | |
| |\ \ \ | ||||||
| | * | | | Fix css alignment in header. Use scss variable | Dmitriy Zaporozhets | 2015-06-05 | 4 | -17/+16 | |
| |/ / / | ||||||
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Jacob Vosmaer | 2015-06-05 | 45 | -280/+570 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-06-05 | 45 | -280/+570 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'refactor-web-editor' into 'master' | Dmitriy Zaporozhets | 2015-06-05 | 9 | -179/+149 | |
| | |\ \ \ | ||||||
| | | * | | | Fix editing files via API | Dmitriy Zaporozhets | 2015-06-05 | 1 | -24/+26 | |
| | | * | | | Refactor web editorrefactor-web-editor | Dmitriy Zaporozhets | 2015-06-05 | 8 | -155/+123 | |
| | * | | | | Improve instructions for publishing gitlab-app. | Sytse Sijbrandij | 2015-06-05 | 1 | -3/+5 | |
| | * | | | | Merge branch 'warn-about-referenced-users' into 'master' | Dmitriy Zaporozhets | 2015-06-05 | 21 | -60/+133 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Prefer jQuery on to bind, and don't use .js class.warn-about-referenced-users | Douwe Maan | 2015-06-05 | 4 | -8/+8 | |
| | | * | | | | Show warning when a comment will add 10 or more people to the discussion. | Douwe Maan | 2015-06-05 | 21 | -59/+132 | |
| | * | | | | | Merge branch 'wip-mr-docs' into 'master' | Dmitriy Zaporozhets | 2015-06-05 | 6 | -3/+17 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Add info about WIP merge requests to docs.wip-mr-docs | Douwe Maan | 2015-06-05 | 6 | -3/+17 | |
| | | |/ / / / | ||||||
| | * | | | | | Merge branch 'fix-long-blob-timeout' into 'master' | Dmitriy Zaporozhets | 2015-06-05 | 2 | -1/+3 | |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||||
| | | * | | | | Fix timeout when rendering file with thousands of lines.fix-long-blob-timeout | Douwe Maan | 2015-06-05 | 2 | -1/+3 | |
| | |/ / / / | ||||||
| | * | | | | Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth' | Douwe Maan | 2015-06-05 | 5 | -15/+221 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Tweak code.cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth | Douwe Maan | 2015-06-05 | 1 | -21/+24 | |
| | | * | | | | Add option to automatically link omniauth and LDAP identities | Alex Lossent | 2015-06-03 | 5 | -16/+219 | |
| | * | | | | | Merge branch 'fix-empty-navbar' into 'master' | Dmitriy Zaporozhets | 2015-06-05 | 2 | -1/+6 | |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| | | * | | | | Fix empty header | Dmitriy Zaporozhets | 2015-06-05 | 2 | -1/+6 | |
| | | | |/ / | | | |/| | | ||||||
| | * | | | | Merge branch 'improve_bitbucket_docs' into 'master' | Douwe Maan | 2015-06-05 | 1 | -18/+36 | |
| | |\ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | | * | | | Improve BitBucket integration documentation [ci skip] | Patrick Fey | 2015-05-15 | 1 | -18/+36 | |
* | | | | | | Make unicorn docs discoverable | Jacob Vosmaer | 2015-06-05 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'understanding-unicorn' into 'master' | Job van der Voort | 2015-06-05 | 1 | -0/+86 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Try to explain Unicorn and unicorn-worker-killer | Jacob Vosmaer | 2015-06-05 | 1 | -0/+86 | |
|/ / / / | ||||||
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-06-05 | 3 | -2/+4 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'maser/gitlab-ce-order-commit-comments-in-api' into 'master' | Dmitriy Zaporozhets | 2015-06-05 | 3 | -2/+4 | |
| |\ \ \ \ | ||||||
| | * | | | | Order commit comments in API chronologically | Martin Luder | 2015-05-08 | 3 | -2/+4 | |
* | | | | | | Merge branch 'ci_script_simplify1' into 'master' | Dmitriy Zaporozhets | 2015-06-05 | 1 | -10/+0 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | CI script: remove directives with default value | Valery Sizov | 2015-06-04 | 1 | -10/+0 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'rs-remove-guard' into 'master' | Dmitriy Zaporozhets | 2015-06-04 | 6 | -85/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove unnecessary require from Spinach env | Robert Speicher | 2015-06-04 | 1 | -1/+0 | |
| * | | | | | Remove unnecessary require from RepositoryCache spec | Robert Speicher | 2015-06-04 | 1 | -1/+0 | |
| * | | | | | Remove Guard | Robert Speicher | 2015-06-03 | 4 | -83/+0 | |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-06-04 | 3 | -3/+24 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'fix-upgrader-script' into 'master' | Dmitriy Zaporozhets | 2015-06-04 | 3 | -3/+24 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Update mocking/stubbing syntax to the new RSpec 3 syntax | Martins Polakovs | 2015-05-30 | 1 | -1/+1 | |
| | * | | | | | | Fix upgrader script | Martins Polakovs | 2015-05-23 | 3 | -3/+24 | |
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-06-04 | 9 | -8/+94 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge branch 'make-namespaces-api-available-to-all-users' into 'master' | Dmitriy Zaporozhets | 2015-06-04 | 7 | -6/+88 | |
| |\ \ \ \ \ \ \ |