| Commit message (Expand) | Author | Age | Files | Lines |
* | Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries" | Stan Hu | 2015-07-09 | 1 | -3/+0 |
* | api: add 'system', 'upvote', and 'downvote' fields to note queries | Ben Boeckel | 2015-07-09 | 1 | -0/+3 |
* | Properly render plain readme | Dmitriy Zaporozhets | 2015-07-09 | 1 | -0/+10 |
* | use teaspoon instead of jasmine for testing javascript | Francesco Coda Zabetta | 2015-07-08 | 1 | -1/+1 |
* | Merge branch 'improve-postgres-restore-cleaning' into 'master'
| Dmitriy Zaporozhets | 2015-07-07 | 3 | -25/+2 |
|\ |
|
| * | Use native Postgres database cleaning during backup restore | Jacob Vosmaer | 2015-07-07 | 3 | -25/+2 |
* | | Merge branch 'compress-db' into 'master' | Kamil TrzciĆski | 2015-07-07 | 1 | -0/+14 |
|\ \ |
|
| * | | Compress database backup | Kamil Trzcinski | 2015-07-06 | 1 | -0/+14 |
| |/ |
|
* | | Merge branch 'settings-via-api' into 'master' | Dmitriy Zaporozhets | 2015-07-07 | 3 | -0/+58 |
|\ \
| |/
|/| |
|
| * | Add tests and improve logic | Dmitriy Zaporozhets | 2015-07-06 | 1 | -1/+2 |
| * | Add docs and empty specs for applicaiton settings API | Dmitriy Zaporozhets | 2015-07-06 | 1 | -2/+1 |
| * | API to set application settings for admin | Dmitriy Zaporozhets | 2015-07-03 | 3 | -0/+58 |
* | | Merge pull request #9430 from gitlabhq/fix-rake-test-ci | Dmitriy Zaporozhets | 2015-07-06 | 1 | -1/+1 |
|\ \ |
|
| * | | Use teaspoon instead of jasmine:ci | Dmitriy Zaporozhets | 2015-07-03 | 1 | -1/+1 |
| |/ |
|
* | | Allow user to be blocked and unblocked via the API | Steve Norman | 2015-07-03 | 1 | -0/+30 |
|/ |
|
* | Extract the longest-matching ref from a commit path when multiple matches occur | Stan Hu | 2015-07-01 | 1 | -2/+6 |
* | Reuse HTML Pipeline object in Markdown parser | Kamil Trzcinski | 2015-06-30 | 1 | -2/+2 |
* | Merge branch '1791-fix-github-issue-order' into 'master' | Stan Hu | 2015-06-29 | 1 | -1/+3 |
|\ |
|
| * | Fix wrong order of issues when importing from github | Hiroyuki Sato | 2015-06-28 | 1 | -1/+3 |
* | | Remove jasmine:ci task, execute teaspoon directly on CIrs-update-gitlab-ci | Robert Speicher | 2015-06-28 | 1 | -12/+0 |
|/ |
|
* | Merge branch 'rename-abilities' into 'master' | Dmitriy Zaporozhets | 2015-06-26 | 4 | -7/+7 |
|\ |
|
| * | Rename abilities to correspond contoller/model action namesrename-abilities | Dmitriy Zaporozhets | 2015-06-26 | 4 | -7/+7 |
* | | Only people who can manage issue can assign labels to itpermission-improvements | Dmitriy Zaporozhets | 2015-06-26 | 1 | -1/+1 |
|/ |
|
* | Add 2FA status to user admin API | Stan Hu | 2015-06-23 | 1 | -0/+1 |
* | Merge branch 'split-tests' into 'master' | Dmitriy Zaporozhets | 2015-06-23 | 21 | -65/+61 |
|\ |
|
| * | Replace GITLAB with GitLab in rake task descriptions | Dmitriy Zaporozhets | 2015-06-23 | 19 | -37/+37 |
| * | Refactor rake tasks for tests | Dmitriy Zaporozhets | 2015-06-23 | 2 | -28/+24 |
* | | Merge branch 'fix-diff-patch-public-mr' into 'master' | Dmitriy Zaporozhets | 2015-06-23 | 2 | -3/+7 |
|\ \
| |/
|/| |
|
| * | Fix downloading of patches on public merge requests when user logged out | Stan Hu | 2015-06-23 | 2 | -3/+7 |
* | | Merge branch 'admin-edit-identities' into 'master' | Dmitriy Zaporozhets | 2015-06-23 | 1 | -0/+19 |
|\ \ |
|
| * \ | Merge branch 'master' into admin-edit-identities | Dmitriy Zaporozhets | 2015-06-22 | 3 | -1/+9 |
| |\ \
| | |/ |
|
| * | | Make provider a select for identities form in admin area | Dmitriy Zaporozhets | 2015-06-22 | 1 | -0/+19 |
* | | | Fix error when deleting a user who has projects | Stan Hu | 2015-06-23 | 1 | -1/+1 |
| |/
|/| |
|
* | | Merge branch 'nginx_defaulthost_documentation' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 2 | -0/+8 |
|\ \ |
|
| * | | fixed typo | Luke Ashe-Browne | 2014-12-03 | 1 | -2/+2 |
| * | | adding notes to gitlab nginx conf | Luke Ashe-Browne | 2014-12-03 | 2 | -1/+9 |
* | | | Merge branch 'restore_uploads_fix' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 1 | -1/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | Avoid "cannot copy directory to itself" restore error | Bryan Stearns | 2014-08-03 | 1 | -1/+1 |
* | | | Fix behavior of ldap_person method in Gitlab::OAuth::User | Alex Lossent | 2015-06-17 | 1 | -4/+5 |
* | | | Dont set checkout sha for removed branch/tag | Dmitriy Zaporozhets | 2015-06-15 | 1 | -2/+5 |
* | | | Merge branch 'update_ssl_ciphers' into 'master' | Dmitriy Zaporozhets | 2015-06-15 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Update SSL ciphers per logjam vulnerability recommendations.update_ssl_ciphers | Marin Jankovski | 2015-06-15 | 1 | -1/+1 |
* | | | | Add Gitlab::Themes module; remove Gitlab::Theme | Robert Speicher | 2015-06-13 | 2 | -50/+67 |
|/ / / |
|
* | | | Merge branch 'feature-session-expire-seconds-ui' into 'master' | Douwe Maan | 2015-06-12 | 1 | -1/+2 |
|\ \ \ |
|
| * | | | session_expire_seconds => session_expire_delay | themaze75 | 2015-06-10 | 1 | -1/+1 |
| * | | | Add session expiration delay configuration through UI application | Eric Maziade | 2015-06-05 | 1 | -1/+2 |
* | | | | Merge branch 'note_about_omnibus_changes' into 'master' | Dmitriy Zaporozhets | 2015-06-12 | 2 | -2/+14 |
|\ \ \ \ |
|
| * | | | | Add a note that changing example configuration files requires changing omnibu...note_about_omnibus_changes | Marin Jankovski | 2015-06-11 | 2 | -2/+14 |
* | | | | | Merge pull request #9371 from zenati/patch-2 | Dmitriy Zaporozhets | 2015-06-11 | 2 | -3/+3 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | An `in_namespace` scope is already present | zenati | 2015-06-09 | 2 | -3/+3 |