| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Dmitriy Zaporozhets | 2015-09-09 | 48 | -230/+1048 |
|\ |
|
| * | Merge branch 'nginx-git-http' into 'master' | Dmitriy Zaporozhets | 2015-09-09 | 2 | -0/+18 |
| |\ |
|
| | * | The good stuff needs NGINX 1.7.11nginx-git-http | Jacob Vosmaer | 2015-09-07 | 2 | -6/+10 |
| | * | Do not let NGINX buffer Git HTTP requests | Jacob Vosmaer | 2015-09-07 | 2 | -0/+14 |
| * | | FogBugz project import | Jared Szechy | 2015-09-08 | 5 | -0/+424 |
| |/ |
|
| * | Merge branch 'url-builder-fix-for-relative-urls' into 'master' | Dmitriy Zaporozhets | 2015-09-07 | 1 | -6/+2 |
| |\ |
|
| | * | Fix URL construction for merge requests, issues, notes, and commits for relat... | Stan Hu | 2015-09-04 | 1 | -6/+2 |
| * | | Merge branch 'upgrade-redis-required-check' into 'master' | Marin Jankovski | 2015-09-07 | 1 | -3/+6 |
| |\ \ |
|
| | * | | Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidek... | Stan Hu | 2015-09-06 | 1 | -4/+7 |
| | |/ |
|
| * | | Use File.join to prevent extra slash in help message from appearing. Before: | Stan Hu | 2015-09-06 | 1 | -2/+2 |
| |/ |
|
| * | Fix `rake services:doc` generation | Stan Hu | 2015-09-03 | 1 | -3/+3 |
| * | Add API method for get user by ID of an SSH key | Artem V. Navrotskiy | 2015-09-03 | 3 | -0/+25 |
| * | Merge branch 'grack-auth-new-instance' into 'master' | Dmitriy Zaporozhets | 2015-09-02 | 1 | -0/+8 |
| |\ |
|
| | * | Avoid instance variable re-use trouble | Jacob Vosmaer | 2015-09-02 | 1 | -0/+8 |
| * | | Drone CI service | Kirilll Zaitsev | 2015-09-02 | 4 | -65/+161 |
| |/ |
|
| * | Merge branch 'use_db_for_application_settings' into 'master' | Marin Jankovski | 2015-09-01 | 1 | -1/+13 |
| |\ |
|
| | * | Added USE_DB env var to allow loading fake settings without db running.use_db_for_application_settings | Marin Jankovski | 2015-09-01 | 1 | -1/+13 |
| * | | Merge branch 'rs-cleanup-redcarpet-renderer' into 'master' | Douwe Maan | 2015-09-01 | 21 | -63/+127 |
| |\ \ |
|
| | * | | Require gitlab/markdown in ReferenceExtractor | Robert Speicher | 2015-09-01 | 1 | -0/+2 |
| | * | | Remove unnecessary `strip` from `reference_class` method | Robert Speicher | 2015-08-31 | 1 | -1/+1 |
| | * | | Move REDCARPET_OPTIONS to a private method | Robert Speicher | 2015-08-31 | 1 | -14/+16 |
| | * | | Make sure the main Gitlab::Markdown module gets loaded before filters | Robert Speicher | 2015-08-27 | 18 | -1/+28 |
| | * | | Reference filters no longer take a custom class context option | Robert Speicher | 2015-08-27 | 2 | -3/+1 |
| | * | | Decouple Gitlab::Markdown from the GitlabMarkdownHelper | Robert Speicher | 2015-08-27 | 4 | -59/+94 |
| * | | | Merge branch 'fix-bitbucket-import-issue-order' into 'master' | Douwe Maan | 2015-09-01 | 5 | -13/+54 |
| |\ \ \ |
|
| | * | | | Fix bug where only the first 15 Bitbucket issues would be imported. | Stan Hu | 2015-09-01 | 5 | -13/+54 |
| | * | | | Sort issues by creation date in Bitbucket importer | Stan Hu | 2015-09-01 | 1 | -1/+1 |
| | | |/
| | |/| |
|
| * | | | Be more defensive when running 'kill'gitlab-git-http-server | Jacob Vosmaer | 2015-08-31 | 1 | -1/+1 |
| * | | | Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-server | Jacob Vosmaer | 2015-08-31 | 5 | -7/+96 |
| |\ \ \
| | |/ / |
|
| | * | | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993 | Douwe Maan | 2015-08-29 | 21 | -60/+690 |
| | |\ \ |
|
| | | * \ | Merge branch 'fix-session_expire_delay' into 'master' | Stan Hu | 2015-08-28 | 1 | -1/+1 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | fixed connection detection so settings can be read from the database | Eric Maziade | 2015-08-27 | 1 | -1/+1 |
| | | * | | Merge branch 'rs-remove-user-color-scheme-class' into 'master' | Douwe Maan | 2015-08-27 | 3 | -3/+87 |
| | | |\ \
| | | | |/
| | | |/| |
|
| | | | * | Add `count` to Themes and ColorSchemes | Robert Speicher | 2015-08-26 | 2 | -0/+10 |
| | | | * | Add `Gitlab::Themes.for_user` | Robert Speicher | 2015-08-26 | 1 | -0/+13 |
| | | | * | Remove user_color_scheme_class | Robert Speicher | 2015-08-25 | 1 | -3/+2 |
| | | | * | Add Gitlab::ColorSchemes module | Robert Speicher | 2015-08-25 | 1 | -0/+62 |
| | * | | | Minor refactor | Douwe Maan | 2015-08-29 | 1 | -7/+8 |
| | * | | | Issue #993: Fixed login failure when extern_uid changes | Joel Koglin | 2015-08-21 | 1 | -3/+7 |
| * | | | | Replace grack with gitlab-git-http-server | Jacob Vosmaer | 2015-08-31 | 5 | -73/+115 |
| | |/ /
| |/| | |
|
* | | | | Move helpers back to original directory | Dmitriy Zaporozhets | 2015-09-09 | 1 | -1/+1 |
* | | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Douwe Maan | 2015-08-26 | 1 | -1/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | Fix init script for Reply by email | Douwe Maan | 2015-08-25 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | Update gitignore, change literal DB table names, fix errors, fix fontawesome | Douwe Maan | 2015-08-26 | 1 | -3/+3 |
* | | | Groundwork for merging CI into CE | Douwe Maan | 2015-08-25 | 36 | -10/+1719 |
|/ / |
|
* | | Ability to search milestonesmilestone_search | Valery Sizov | 2015-08-24 | 1 | -1/+13 |
* | | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab | Stan Hu | 2015-08-23 | 8 | -30/+54 |
* | | Merge branch 'reply-by-email' into 'master' | Robert Speicher | 2015-08-22 | 7 | -24/+528 |
|\ \ |
|
| * | | No HTML-only email please | Douwe Maan | 2015-08-21 | 2 | -153/+6 |
| * | | Fix check task for development. | Douwe Maan | 2015-08-21 | 1 | -2/+2 |