summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-042-2/+2
* Fix test errorLin Jen-Shin2017-05-041-1/+1
* Merge branch 'snippets-finder-visibility' into 'security' Douwe Maan2017-05-044-8/+6
* Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-041-0/+4
* Merge branch 'bvl-security-9-1-markup-pipeline' into 'security-9-1'Robert Speicher2017-05-043-7/+18
* Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri' into 'sec...Robert Speicher2017-05-041-18/+18
* Merge branch 'fix/github-importer' into 'master' Sean McGivern2017-04-2820-90/+916
* Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-281-6/+17
* Merge branch '31280-skip-issueables-without-project' into 'master' Sean McGivern2017-04-261-1/+5
* Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabledrc/dm-fix-oauth-user-creation-9-1-stableDouwe Maan2017-04-251-1/+1
* Merge branch 'fix/encoding-issue' into 'master' Sean McGivern2017-04-211-1/+7
* Merge branch 'fix-jobs-enabled-parameter' into 'master'Sean McGivern2017-04-211-2/+5
* Merge branch 'add-email-receiver-metrics' into 'master' Douwe Maan2017-04-213-4/+8
* Merge branch 'usage-ping-port' into 'master'Sean McGivern2017-04-207-1/+130
* Merge branch 'issuable-state-custom-links' into 'master' Sean McGivern2017-04-201-2/+2
* Merge branch 'plantuml-filter-after-highlight' into 'master' Sean McGivern2017-04-201-4/+4
* Merge branch 'issuable-state-only-notes-and-description' into 'master' Sean McGivern2017-04-201-0/+2
* Merge branch 'fix/gb/container-registry-repository-paths' into 'master' Kamil Trzciński2017-04-191-2/+8
* Merge branch 'fix/improve-gitaly-unsupported-address-error' into 'master' Robert Speicher2017-04-191-1/+1
* Merge branch '30696-long-build-log-improvement' into 'master' Phil Hughes2017-04-191-1/+1
* Merge branch 'enforce-Ansi2html-output-encoding' into 'master' Kamil Trzciński2017-04-182-11/+4
* Merge branch 'fix/30961' into 'master' Robert Speicher2017-04-181-1/+0
* Merge branch 'fix-trace-encoding' into 'master' Sean McGivern2017-04-171-2/+9
* Merge branch 'sh-fix-base-parser' into 'master' Robert Speicher2017-04-171-1/+2
* Merge branch 'fix-appending-state-to-issuable-references' into 'master' Robert Speicher2017-04-141-2/+2
* Merge branch 'zero-downtime-migrations' into 'master' Douwe Maan2017-04-142-1/+293
* Merge branch 'fix/gb/fix-registry-for-uppercased-project-paths' into 'master' Kamil Trzciński2017-04-131-2/+2
* Merge branch 'fix-trace-seeking-readline' into 'master' Kamil Trzciński2017-04-131-4/+3
* Merge branch 'backport-ee-1525' into 'master' Robert Speicher2017-04-138-57/+91
* Merge branch 'zj-api-fix-build-events' into 'master' Rémy Coutable2017-04-131-3/+9
* Merge branch 'zj-fix-coverage-bug' into 'master' Kamil Trzciński2017-04-131-1/+4
* Merge branch 'test-all-etag-routes' into 'master' Sean McGivern2017-04-112-34/+41
* Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' Kamil Trzciński2017-04-111-0/+4
* Remove the User#is_admin? methodblackst0ne2017-04-0913-22/+22
* Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-0710-40/+138
|\
| * Merge branch 'adam-finish-5993-closed-issuable' into 'master' Douwe Maan2017-04-079-40/+124
| |\
| | * Add indication for closed or merged issuables in GFMadam-finish-5993-closed-issuableAdam Buckland2017-04-079-40/+124
| * | Merge branch 'feature/add-rake-task-prints-storage-config-in-toml' into 'mast...Robert Speicher2017-04-071-0/+14
| |\ \ | | |/ | |/|
| | * Add rake task that prints TOML storage configurationfeature/add-rake-task-prints-storage-config-in-tomlAhmad Sherif2017-04-041-0/+14
* | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-078-23/+169
|\ \ \ | |/ /
| * | Fix rake test to import Github repositoriesDouglas Barbosa Alexandre2017-04-071-2/+9
| * | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' Kamil Trzciński2017-04-071-0/+103
| |\ \
| | * | Take the ref of a pipeline into account when caching statusBob Van Landuyt2017-04-071-9/+18
| | * | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`Bob Van Landuyt2017-04-071-1/+1
| | * | Wrap updating of cache after pipeline transition in class methodBob Van Landuyt2017-04-071-0/+4
| | * | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatusBob Van Landuyt2017-04-071-0/+90
| * | | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-076-21/+57
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0624-151/+533
| | |\ \
| | * \ \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-0612-23/+279
| | |\ \ \
| | * | | | Fix projected import failing on missing relationsJames Edwards-Jones2017-04-061-1/+5