summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Comment out breakpoint recalc.big-diff-perfBryce Johnson2017-04-121-6/+6
* More possible culprits.Bryce Johnson2017-04-128-45/+45
* The culprit is one of these.Bryce Johnson2017-04-1119-3710/+83
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceBryce Johnson2017-04-112-1/+47
|\
| * 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
* | | | Nullify localTimeAgo.Bryce Johnson2017-04-111-0/+3
|/ / /
* | | 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
| |\ \ \ \ \ \
| * | | | | | | replace relative urls - html to mdMarcia Ramos2017-03-301-8/+8
| * | | | | | | fix headingMarcia Ramos2017-03-301-1/+1
| * | | | | | | add intro, move version control to getting startedMarcia Ramos2017-03-301-6/+14
| * | | | | | | add general info, fix linksMarcia Ramos2017-03-301-8/+16
| * | | | | | | add Git indexMarcia Ramos2017-03-301-0/+46
| * | | | | | | add Git topic, reorder topics alphabeticallyMarcia Ramos2017-03-301-1/+2
* | | | | | | | Merge branch 'rs-remove-open-for-scope' into 'master' test-branch-nameDouwe Maan2017-04-114-16/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove an unused `cared` scope from Issue and MergeRequestrs-remove-open-for-scopeRobert Speicher2017-04-103-6/+0
| * | | | | | | | Remove an unused `Issue.open_for` scopeRobert Speicher2017-04-102-10/+0
* | | | | | | | | Merge branch 'zj-fk-ci-triggers' into 'master' Yorick Peterse2017-04-114-1/+22
|\ \ \ \ \ \ \ \ \