summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Properly use $BUNDLE_INSTALL_FLAGStest-pg-mysqltest-pgLin Jen-Shin2017-04-132-5/+4
* Always use . and add more comments to prepare_build.shLin Jen-Shin2017-04-132-2/+7
* Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-1219-146/+221
|\
| * Merge branch 'siemens/gitlab-ce-fix/subgroup-hide-button' into 'master' Rémy Coutable2017-04-124-2/+8
| |\
| | * Update changelog with MR idsiemens/gitlab-ce-fix/subgroup-hide-buttonDmitriy Zaporozhets2017-04-111-1/+1
| | * Move permission to create subgroup into GroupPolicyDmitriy Zaporozhets2017-04-116-28/+8
| | * fix(subgroups): add verification of group creation capability to subgroup UIFabio Huser2017-03-303-1/+27
| * | Merge branch 'gitaly-testing' into 'master' Rémy Coutable2017-04-1212-143/+197
| |\ \
| | * | Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-1112-143/+197
| * | | Merge branch '30457-expire-note-destroy' into 'master'Sean McGivern2017-04-123-1/+16
| |\ \ \
| | * | | Fix issue's note cache expiration after deletemhasbini2017-04-113-1/+16
* | | | | Remove duplicated lineLin Jen-Shin2017-04-121-1/+0
* | | | | Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-12185-1248/+3349
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'bb_save_trace' into 'master' Sean McGivern2017-04-123-6/+9
| |\ \ \ \
| | * | | | [BB Importer] Save the error trace and the whole raw documentbb_save_traceValery Sizov2017-04-113-6/+9
| * | | | | Merge branch 'docs-topic-auth' into 'master' Marcia Ramos2017-04-122-1/+47
| |\ \ \ \ \
| | * \ \ \ \ fix conflictdocs-topic-authMarcia Ramos2017-04-1159-215/+829
| | |\ \ \ \ \
| | * | | | | | typoMarcia Ramos2017-04-101-1/+1
| | * | | | | | fix typoMarcia Ramos2017-04-101-1/+1
| | * | | | | | fix linksMarcia Ramos2017-04-101-2/+2
| | * | | | | | add topic: authenticationMarcia Ramos2017-04-102-2/+48
| * | | | | | | Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-1125-82/+226
| |\ \ \ \ \ \ \
| | * | | | | | | Statisfy Robertcop and Seancopdm-outdated-diff-linkDouwe Maan2017-04-112-10/+4
| | * | | | | | | Add specsDouwe Maan2017-04-105-2/+98
| | * | | | | | | Fix specsDouwe Maan2017-04-093-5/+8
| | * | | | | | | Some code tweaksDouwe Maan2017-04-088-18/+21
| | * | | | | | | Fix views after rebaseDouwe Maan2017-04-082-3/+5
| | * | | | | | | Fix find_by_diff_refsDouwe Maan2017-04-081-1/+1
| | * | | | | | | Fix specs and make tweaksDouwe Maan2017-04-087-39/+50
| | * | | | | | | Change discussion headline to 'a now outdated portion of the diff'Douwe Maan2017-04-081-4/+3
| | * | | | | | | Add link to diff header tooDouwe Maan2017-04-082-14/+16
| | * | | | | | | Cache MR diffs by diff refsDouwe Maan2017-04-082-1/+11
| | * | | | | | | Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-0815-39/+63
| * | | | | | | | Merge branch '28017-separate-ce-params-on-api' into 'master' Douwe Maan2017-04-118-30/+122
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add share_with_group_lock to CE optional params block28017-separate-ce-params-on-apiOswaldo Ferreira2017-04-101-0/+1
| | * | | | | | | | Separate CE params on Grape APIOswaldo Ferreira2017-04-108-30/+121
| * | | | | | | | | Merge branch 'removed-notebooklab-absolute-paths' into 'master' Jacob Schatz2017-04-111-215/+32
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed notebooklab code including file pathsremoved-notebooklab-absolute-pathsPhil Hughes2017-04-111-215/+32
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'update-doc-installation-and-upgrade' into 'master' Robert Speicher2017-04-112-7/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update documents according to:update-doc-installation-and-upgradeLin Jen-Shin2017-04-112-7/+3
| * | | | | | | | | | Merge branch '30636-fix-blame-edit-blob-without-repo-permissions' into 'master' Annabel Dunstone Gray2017-04-112-7/+7
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix edit button on blame page without repo perms30636-fix-blame-edit-blob-without-repo-permissionsEric Eastwood2017-04-102-7/+7
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'update-licenses.csv' into 'master' Robert Speicher2017-04-111-146/+322
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | Update licenses.csv via:update-licenses.csvLin Jen-Shin2017-04-111-146/+322
| * | | | | | | | | | Merge branch 'gitlab-update_templates' into 'master'Robert Speicher2017-04-1114-70/+68
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Update templates via:gitlab-update_templatesLin Jen-Shin2017-04-1114-70/+68
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'new-git-index' into 'master' Marcia Ramos2017-04-112-4/+64
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Axil's reviewnew-git-indexMarcia Ramos2017-04-111-2/+1
| | * | | | | | | | | remove unnecessary lineMarcia Ramos2017-04-111-3/+1
| | * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into new-git-indexMarcia Ramos2017-04-111402-10462/+80811
| | |\ \ \ \ \ \ \ \ \