Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sh-bump-sidekiq-version' into 'master' | Robert Speicher | 2017-04-25 | 2 | -1/+5 |
|\ | |||||
| * | Upgrade Sidekiq to 4.2.10sh-bump-sidekiq-version | Stan Hu | 2017-04-24 | 2 | -1/+5 |
* | | Merge branch '31174-project-integration-service-sub-nav' into 'master' | Alfredo Sumaran | 2017-04-25 | 4 | -2/+7 |
|\ \ | |||||
| * | | Add sub-nav for Project Integration Services edit page | Kushal Pandya | 2017-04-25 | 4 | -2/+7 |
|/ / | |||||
* | | Merge branch 'dm-fix-oauth-user-creation' into 'master' | Robert Speicher | 2017-04-25 | 7 | -5/+47 |
|\ \ | |||||
| * | | Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creation | Douwe Maan | 2017-04-24 | 7 | -5/+47 |
| |/ | |||||
* | | Merge branch 'fix/web_hooks-index' into 'master' | Douwe Maan | 2017-04-25 | 3 | -1/+21 |
|\ \ | |||||
| * | | Add index to webhooks type column | James Lopez | 2017-04-25 | 3 | -1/+21 |
|/ / | |||||
* | | Merge branch 'ignore-all-builds-dirs' into 'master' | Rémy Coutable | 2017-04-25 | 1 | -1/+1 |
|\ \ | |||||
| * | | Ignore all builds* directories from version controlignore-all-builds-dirs | Achilleas Pipinellis | 2017-04-25 | 1 | -1/+1 |
* | | | Merge branch '31276-fix-diffs-with-edit-forking-needs' into 'master' | Douwe Maan | 2017-04-25 | 6 | -21/+64 |
|\ \ \ | |||||
| * | | | Fix diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needs | Eric Eastwood | 2017-04-24 | 6 | -21/+64 |
* | | | | Merge branch 'fix-usage-ping-doc-link' into 'master' | Rémy Coutable | 2017-04-25 | 2 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | Fix usage ping docs link from empty cohorts pagefix-usage-ping-doc-link | Sean McGivern | 2017-04-25 | 2 | -1/+5 |
* | | | | | Merge branch 'patch-17' into 'master' | Rémy Coutable | 2017-04-25 | 1 | -8/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Update markdown.md | Simon Hardt | 2017-04-25 | 1 | -8/+10 |
|/ / / / / | |||||
* | | | | | Merge branch '21683-show-created-group-name-flash' into 'master' | Sean McGivern | 2017-04-25 | 2 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Show group name on flash container when group is created from Admin area | Kushal Pandya | 2017-04-25 | 2 | -1/+5 |
|/ / / / / | |||||
* | | | | | Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master' | Sean McGivern | 2017-04-25 | 12 | -23/+27 |
|\ \ \ \ \ | |||||
| * | | | | | Update documentation to reflect the removal of `is_admin` from most API respo... | Timothy Andrew | 2017-04-25 | 4 | -14/+0 |
| * | | | | | Add changelog entry for !10846 | Timothy Andrew | 2017-04-25 | 1 | -0/+4 |
| * | | | | | Don't display the `is_admin?` flag for user API responses. | Timothy Andrew | 2017-04-25 | 7 | -9/+23 |
* | | | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2017-04-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix typo in discussions doc. | Marland Sitt | 2017-04-24 | 1 | -1/+1 |
* | | | | | | | Merge branch '30649-update-health-check-documentation' into 'master' | Achilleas Pipinellis | 2017-04-25 | 1 | -17/+59 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Add Health Check Documentation | Joshua Lambert | 2017-04-25 | 1 | -17/+59 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'gitaly-testing-toml' into 'master' | Rémy Coutable | 2017-04-25 | 3 | -6/+42 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Configure Gitaly through settings file instead of ENV varsgitaly-testing-toml | Alejandro Rodríguez | 2017-04-18 | 3 | -6/+42 |
* | | | | | | Merge branch 'sh-fix-spinach-5-10-tests' into 'master' | Robert Speicher | 2017-04-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix scoping issues with Spinach tests (e.g. https://gitlab.com/gitlab-org/git...sh-fix-spinach-5-10-tests | Stan Hu | 2017-04-24 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'vue-experts' into 'master' | Jacob Schatz | 2017-04-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove names from docs and add vue experts insteadvue-experts | Filipa Lacerda | 2017-04-20 | 1 | -1/+1 |
* | | | | | | | Merge branch 'use-jquery-on-blob-fork-suggestion' into 'master' | Jacob Schatz | 2017-04-24 | 3 | -44/+43 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use jQuery niceness on blob_fork_suggestionuse-jquery-on-blob-fork-suggestion | Eric Eastwood | 2017-04-22 | 3 | -44/+43 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'add-aria-to-icon' into 'master' | Jacob Schatz | 2017-04-24 | 3 | -0/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update changelog | Clement Ho | 2017-04-24 | 1 | -1/+1 |
| * | | | | | | | Improve specsadd-aria-to-icon | Clement Ho | 2017-04-24 | 1 | -1/+3 |
| * | | | | | | | Add tests | Clement Ho | 2017-04-18 | 2 | -1/+14 |
| * | | | | | | | Add aria to icon | Clement Ho | 2017-04-12 | 2 | -0/+9 |
* | | | | | | | | Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master' | Sean McGivern | 2017-04-24 | 4 | -1/+22 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Ensure replying to an individual note by email creates a note with its own di...dm-fix-individual-notes-reply-attributes | Douwe Maan | 2017-04-24 | 4 | -1/+22 |
* | | | | | | | | | Merge branch '31269-task-scroll' into 'master' | Jacob Schatz | 2017-04-24 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add normal wrapping to task lists31269-task-scroll | Annabel Dunstone Gray | 2017-04-21 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch 'notebooklab-in-repo' into 'master' | Jacob Schatz | 2017-04-24 | 22 | -5736/+933 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into notebooklab-in-reponotebooklab-in-repo | Phil Hughes | 2017-04-13 | 61 | -2015/+2137 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Pulled in latest changes | Phil Hughes | 2017-04-13 | 1 | -14/+59 |
| * | | | | | | | | | | | Pulled in latest changes from NotebookLab | Phil Hughes | 2017-04-13 | 1 | -0/+4 |
| * | | | | | | | | | | | Merge branch 'master' into notebooklab-in-repo | Phil Hughes | 2017-04-13 | 162 | -1219/+3343 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Pull in fixture files from the repo | Phil Hughes | 2017-04-11 | 6 | -7/+49 |
| * | | | | | | | | | | | | Removed notebooklab vendor file | Phil Hughes | 2017-04-11 | 1 | -5887/+0 |