summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creationDouwe Maan2017-04-247-5/+47
* 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
| * | | | | | | | Moved NotebookLab assets into repoPhil Hughes2017-04-1119-2/+841
* | | | | | | | | Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' Sean McGivern2017-04-244-5/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-urlStan Hu2017-04-243-5/+24
| * | | | | | | | | Eliminate N+1 queries in loading namespaces for every issuable in milestonesStan Hu2017-04-232-1/+5
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master' Sean McGivern2017-04-243-8/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix commenting on an existing discussion on an unchanged line that is no long...Douwe Maan2017-04-243-8/+15
| |/ / / / / / / /
* | | | | | | | | Merge branch 'diff-discussion-buttons-spacing' into 'master' Annabel Dunstone Gray2017-04-242-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes the spacing around diff discussion buttonsdiff-discussion-buttons-spacingPhil Hughes2017-04-242-0/+5
* | | | | | | | | | Merge branch 'test-pg' into 'master' Rémy Coutable2017-04-246-85/+212
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Avoid Rails generating complicated query, see:Lin Jen-Shin2017-04-111-1/+1
| * | | | | | | | | | | | Move variables back to where they areLin Jen-Shin2017-04-111-6/+6
| * | | | | | | | | | | | Just set GITLAB_DATABASE in the scriptLin Jen-Shin2017-04-112-7/+1
| * | | | | | | | | | | | Add # host for development and test as wellLin Jen-Shin2017-04-111-0/+2
| * | | | | | | | | | | | We cannot use array in yaml variablesLin Jen-Shin2017-04-112-3/+6
| * | | | | | | | | | | | Set profiler only for postgresql not mysqlLin Jen-Shin2017-04-101-1/+1
| * | | | | | | | | | | | Use GITLAB_DATABASE: $CI_JOB_NAME[1] so that weLin Jen-Shin2017-04-102-29/+21
| * | | | | | | | | | | | Replace on host rather than socket, feedback:Lin Jen-Shin2017-04-101-1/+1
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-10462-4822/+10582
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-071165-6149/+77800
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Only upload/download knapsack reports from pgLin Jen-Shin2017-03-291-4/+4
| * | | | | | | | | | | | | | Switch back to original repositoryLin Jen-Shin2017-03-291-1/+1
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-03-29154-457/+787
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status