summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-bump-sidekiq-version' into 'master' Robert Speicher2017-04-252-1/+5
|\
| * Upgrade Sidekiq to 4.2.10sh-bump-sidekiq-versionStan Hu2017-04-242-1/+5
* | Merge branch '31174-project-integration-service-sub-nav' into 'master' Alfredo Sumaran2017-04-254-2/+7
|\ \
| * | Add sub-nav for Project Integration Services edit pageKushal Pandya2017-04-254-2/+7
|/ /
* | Merge branch 'dm-fix-oauth-user-creation' into 'master' Robert Speicher2017-04-257-5/+47
|\ \
| * | Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creationDouwe Maan2017-04-247-5/+47
| |/
* | Merge branch 'fix/web_hooks-index' into 'master' Douwe Maan2017-04-253-1/+21
|\ \
| * | Add index to webhooks type columnJames Lopez2017-04-253-1/+21
|/ /
* | Merge branch 'ignore-all-builds-dirs' into 'master' Rémy Coutable2017-04-251-1/+1
|\ \
| * | Ignore all builds* directories from version controlignore-all-builds-dirsAchilleas Pipinellis2017-04-251-1/+1
* | | Merge branch '31276-fix-diffs-with-edit-forking-needs' into 'master' Douwe Maan2017-04-256-21/+64
|\ \ \
| * | | Fix diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needsEric Eastwood2017-04-246-21/+64
* | | | Merge branch 'fix-usage-ping-doc-link' into 'master' Rémy Coutable2017-04-252-1/+5
|\ \ \ \
| * | | | Fix usage ping docs link from empty cohorts pagefix-usage-ping-doc-linkSean McGivern2017-04-252-1/+5
* | | | | Merge branch 'patch-17' into 'master' Rémy Coutable2017-04-251-8/+10
|\ \ \ \ \
| * | | | | Update markdown.mdSimon Hardt2017-04-251-8/+10
|/ / / / /
* | | | | Merge branch '21683-show-created-group-name-flash' into 'master' Sean McGivern2017-04-252-1/+5
|\ \ \ \ \
| * | | | | Show group name on flash container when group is created from Admin areaKushal Pandya2017-04-252-1/+5
|/ / / / /
* | | | | Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master' Sean McGivern2017-04-2512-23/+27
|\ \ \ \ \
| * | | | | Update documentation to reflect the removal of `is_admin` from most API respo...Timothy Andrew2017-04-254-14/+0
| * | | | | Add changelog entry for !10846Timothy Andrew2017-04-251-0/+4
| * | | | | Don't display the `is_admin?` flag for user API responses.Timothy Andrew2017-04-257-9/+23
* | | | | | Merge branch 'master' into 'master' Rémy Coutable2017-04-251-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo in discussions doc.Marland Sitt2017-04-241-1/+1
* | | | | | | Merge branch '30649-update-health-check-documentation' into 'master' Achilleas Pipinellis2017-04-251-17/+59
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add Health Check DocumentationJoshua Lambert2017-04-251-17/+59
|/ / / / / /
* | | | | | Merge branch 'gitaly-testing-toml' into 'master' Rémy Coutable2017-04-253-6/+42
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Configure Gitaly through settings file instead of ENV varsgitaly-testing-tomlAlejandro Rodríguez2017-04-183-6/+42
* | | | | | Merge branch 'sh-fix-spinach-5-10-tests' into 'master' Robert Speicher2017-04-241-1/+1
|\ \ \ \ \ \
| * | | | | | Fix scoping issues with Spinach tests (e.g. https://gitlab.com/gitlab-org/git...sh-fix-spinach-5-10-testsStan Hu2017-04-241-1/+1
|/ / / / / /
* | | | | | Merge branch 'vue-experts' into 'master' Jacob Schatz2017-04-241-1/+1
|\ \ \ \ \ \
| * | | | | | Remove names from docs and add vue experts insteadvue-expertsFilipa Lacerda2017-04-201-1/+1
* | | | | | | Merge branch 'use-jquery-on-blob-fork-suggestion' into 'master' Jacob Schatz2017-04-243-44/+43
|\ \ \ \ \ \ \
| * | | | | | | Use jQuery niceness on blob_fork_suggestionuse-jquery-on-blob-fork-suggestionEric Eastwood2017-04-223-44/+43
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'add-aria-to-icon' into 'master' Jacob Schatz2017-04-243-0/+24
|\ \ \ \ \ \ \
| * | | | | | | Update changelogClement Ho2017-04-241-1/+1
| * | | | | | | Improve specsadd-aria-to-iconClement Ho2017-04-241-1/+3
| * | | | | | | Add testsClement Ho2017-04-182-1/+14
| * | | | | | | Add aria to iconClement Ho2017-04-122-0/+9
* | | | | | | | Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master' Sean McGivern2017-04-244-1/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure replying to an individual note by email creates a note with its own di...dm-fix-individual-notes-reply-attributesDouwe Maan2017-04-244-1/+22
* | | | | | | | | Merge branch '31269-task-scroll' into 'master' Jacob Schatz2017-04-241-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add normal wrapping to task lists31269-task-scrollAnnabel Dunstone Gray2017-04-211-0/+4
* | | | | | | | | | Merge branch 'notebooklab-in-repo' into 'master' Jacob Schatz2017-04-2422-5736/+933
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into notebooklab-in-reponotebooklab-in-repoPhil Hughes2017-04-1361-2015/+2137
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Pulled in latest changesPhil Hughes2017-04-131-14/+59
| * | | | | | | | | | | Pulled in latest changes from NotebookLabPhil Hughes2017-04-131-0/+4
| * | | | | | | | | | | Merge branch 'master' into notebooklab-in-repoPhil Hughes2017-04-13162-1219/+3343
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Pull in fixture files from the repoPhil Hughes2017-04-116-7/+49
| * | | | | | | | | | | | Removed notebooklab vendor filePhil Hughes2017-04-111-5887/+0