Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve validity of spec/features/todos/todos_filtering_spec.rbrs-fix-todos-filtering-spec | Robert Speicher | 2016-09-14 | 1 | -4/+16 |
* | Add missing 8.10.9 CHANGELOG entries | Rémy Coutable | 2016-09-14 | 1 | -0/+7 |
* | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq | Rémy Coutable | 2016-09-14 | 2 | -11/+64 |
|\ | |||||
| * | Merge branch '21650-only-active-users-can-be-members' into 'master' | Douwe Maan | 2016-09-14 | 2 | -11/+64 |
| |\ | |||||
| | * | Exclude some pending or inactivated rows in Member scopes | Nick Thomas | 2016-09-08 | 2 | -11/+64 |
* | | | Update CHANGELOG for 8.9.9 and 8.11.6 | Rémy Coutable | 2016-09-14 | 1 | -2/+11 |
* | | | Merge branch 'fix-remove-merge-request-diff-unique-index' into 'master' | Rémy Coutable | 2016-09-14 | 1 | -3/+17 |
|\ \ \ | |||||
| * | | | Fix migration for removing MR diff indexes | Yorick Peterse | 2016-09-14 | 1 | -3/+17 |
* | | | | Merge branch 'update-gitlab-git' into 'master' | Douwe Maan | 2016-09-14 | 4 | -4/+36 |
|\ \ \ \ | |||||
| * | | | | Handle encoding in non-binary Blob instancesupdate-gitlab-git | Yorick Peterse | 2016-09-14 | 2 | -0/+32 |
| * | | | | Update gitlab_git to 10.6.6 | Yorick Peterse | 2016-09-14 | 2 | -4/+4 |
* | | | | | Merge branch 'backport_to_search_helper_from_ee' into 'master' | Rémy Coutable | 2016-09-14 | 6 | -60/+66 |
|\ \ \ \ \ | |||||
| * | | | | | Backport search_helper changes from EEbackport_to_search_helper_from_ee | Valery Sizov | 2016-09-14 | 6 | -60/+66 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch '5874-add-specs-for-removing-project' into 'master' | Douwe Maan | 2016-09-14 | 3 | -3/+40 |
|\ \ \ \ \ | |||||
| * | | | | | add test about flash alert | ubudzisz | 2016-09-14 | 3 | -3/+40 |
* | | | | | | Merge branch '21748-updating-omniauth-facebook' into 'master' | Douwe Maan | 2016-09-14 | 2 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update omniauth-facebook to '~>4.0.0' | Katarzyna Kobierska | 2016-09-13 | 2 | -4/+4 |
* | | | | | | | Merge branch 'document-checkout-mr-from-forks-locally' into 'master' | Job van der Voort | 2016-09-14 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Document the fact that merge requests from private forks can be checked out l...document-checkout-mr-from-forks-locally | Rémy Coutable | 2016-09-13 | 1 | -0/+3 |
* | | | | | | | Merge branch 'gitlab_shell_350' into 'master' 21249-update-labels-sidebar-live-after-slash-command-existing-issue-mr-ajax | Rémy Coutable | 2016-09-14 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Update the 8.11 to 8.12 update documentation to use gitlab-shell 3.5.0 | Rémy Coutable | 2016-09-14 | 1 | -1/+1 |
| * | | | | | | Update GITLAB_SHELL_VERSION | Drew Blessing | 2016-09-14 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'fix/gitlab-popen-thread-safety' into 'master' | Stan Hu | 2016-09-14 | 2 | -6/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix Gitlab::Popen.popen thread-safety issuefix/gitlab-popen-thread-safety | Ahmad Sherif | 2016-09-13 | 2 | -6/+7 |
* | | | | | | | Merge branch 'pushes-since-gc-redis' into 'master' 19600-artifacts-show-up-in-interface-as-expired-immediately-although-configured-as-1-month-or-4-weeks | Robert Speicher | 2016-09-13 | 7 | -33/+99 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move pushes_since_gc to Redispushes-since-gc-redis | Yorick Peterse | 2016-09-13 | 7 | -33/+99 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'workhorse-secret-trailing-newline' into 'master' | Stan Hu | 2016-09-13 | 2 | -1/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Allow trailing newline in secret base64 data | Jacob Vosmaer | 2016-09-13 | 2 | -1/+6 |
* | | | | | | | | Merge branch 'rc-use-haml_lint' into 'master' | Robert Speicher | 2016-09-13 | 5 | -0/+119 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Improve .haml-lint.yml, simplify the haml_lint task and remove CHANGELOG entryrc-use-haml_lint | Rémy Coutable | 2016-09-13 | 3 | -10/+2 |
| * | | | | | | | Add haml_lint rake task | Rémy Coutable | 2016-09-13 | 2 | -1/+9 |
| * | | | | | | | Add .haml-lint.yml | Rémy Coutable | 2016-09-13 | 1 | -0/+107 |
| * | | | | | | | Use haml_lint for views linting | Rémy Coutable | 2016-09-13 | 4 | -0/+12 |
* | | | | | | | | Merge branch 'feature/builds-register-change-404-to-204' into 'master' | Rémy Coutable | 2016-09-13 | 7 | -20/+68 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix a typo in documentationfeature/builds-register-change-404-to-204 | Tomasz Maczukin | 2016-09-13 | 1 | -1/+1 |
| * | | | | | | | Add test with inactive error use case for 'POST /ci/api/v1/builds/register.json' | Tomasz Maczukin | 2016-09-13 | 2 | -0/+14 |
| * | | | | | | | Fix rubocop offences | Tomasz Maczukin | 2016-09-13 | 1 | -1/+1 |
| * | | | | | | | Update API documentation | Tomasz Maczukin | 2016-09-13 | 1 | -0/+9 |
| * | | | | | | | Update CHANGELOG | Tomasz Maczukin | 2016-09-13 | 1 | -0/+1 |
| * | | | | | | | Change response for /ci/api/v1/builds/register.json from 404 to 204 | Tomasz Maczukin | 2016-09-13 | 4 | -20/+44 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs-ssh-key-title-populate' into 'master' | Robert Speicher | 2016-09-13 | 3 | -0/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Restore SSH Key title auto-population behavior | Robert Speicher | 2016-09-13 | 3 | -0/+20 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'patch-4' into 'master' | Robert Speicher | 2016-09-13 | 2 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | update gitlab shell secret file also when it is empty | Elan Ruusamäe | 2016-09-13 | 2 | -1/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '20780-import-github-release-notes' into 'master' | Robert Speicher | 2016-09-13 | 6 | -2/+120 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Import GitHub release notes | Andrew Smith | 2016-09-13 | 6 | -2/+120 |
| |/ / / / / | |||||
* | | | | | | Merge branch '21636-deleting-source-project-with-existing-fork-closes-all-rel... | Rémy Coutable | 2016-09-13 | 8 | -21/+127 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Change method name to #reopenable? | Katarzyna Kobierska | 2016-09-13 | 3 | -12/+13 |
| * | | | | | Improve grammar | Katarzyna Kobierska | 2016-09-13 | 2 | -2/+2 |
| * | | | | | Fix not working test with execute | Katarzyna Kobierska | 2016-09-13 | 1 | -4/+4 |