summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* remove gl_project_id for I/E version updatefix/gl-project-idJames Lopez2017-05-021-1/+0
* Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' Douwe Maan2017-05-011-0/+2
|\
| * Don't blow up when email has no References headerdont-blow-up-when-email-has-no-references-headerSean McGivern2017-05-011-0/+2
* | Merge branch '28968-revert-allow-people-with-merge-access-to-create-branches'...Douwe Maan2017-05-011-3/+1
|\ \
| * | Prevent people from creating branches if they don't have persmission to pushPawel Chojnacki2017-04-281-3/+1
| |/
* | Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestorKim "BKC" Carlbäcker2017-04-282-13/+22
|/
* Merge branch 'dm-blob-viewers' into 'master' Tim Zallmann2017-04-281-4/+0
|\
| * Small code tweaksDouwe Maan2017-04-271-4/+0
* | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' int...Douwe Maan2017-04-271-5/+4
|\ \ | |/ |/|
| * improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projectsTiago Botelho2017-04-271-5/+4
* | Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-271-6/+17
|\ \
| * | Fix ordering of commits in the network graph.Timothy Andrew2017-04-271-6/+17
* | | Remove unused optional parameter `asciidoc_opts`Toon Claes2017-04-271-8/+4
* | | Refactor MarkupHelperDouwe Maan2017-04-272-14/+2
* | | Cache the rendered README, but post-process on showToon Claes2017-04-272-4/+0
* | | Submodule Dockerfile templatesZeger-Jan van de Weg2017-04-261-2/+2
* | | Load a project's CI status in batch from redisBob Van Landuyt2017-04-261-9/+44
* | | Decrease Cyclomatic Complexity threshold to 16Maxim Rydkin2017-04-261-40/+30
* | | Merge branch '20378-natural-sort-issue-numbers' into 'master'Sean McGivern2017-04-261-0/+29
|\ \ \ | |/ / |/| |
| * | Change issues sentence to use natural sortingJeff Stubler2017-04-251-0/+29
* | | Merge branch 'mr-diff-size-overflow' into 'master' Douwe Maan2017-04-251-0/+4
|\ \ \
| * | | Show correct size when MR diff overflowsSean McGivern2017-04-251-0/+4
* | | | Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creationDouwe Maan2017-04-241-1/+1
|/ / /
* | | Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master' Sean McGivern2017-04-241-1/+8
|\ \ \
| * | | Fix commenting on an existing discussion on an unchanged line that is no long...Douwe Maan2017-04-241-1/+8
| | |/ | |/|
* | | Merge branch '30305-oauth-token-push-code' into 'master' Rémy Coutable2017-04-241-1/+1
|\ \ \
| * | | Allow OAuth clients to push code30305-oauth-token-push-codeTimothy Andrew2017-04-131-1/+1
* | | | Merge branch 'email-handler-metrics' into 'master' Sean McGivern2017-04-245-5/+17
|\ \ \ \
| * | | | Make handler metric params more explicitemail-handler-metricsSean McGivern2017-04-215-5/+17
* | | | | Merge branch 'workhorse-secret-path' into 'master' Rémy Coutable2017-04-241-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make location of gitlab_workhorse_secret configurableJakub Jirutka2017-04-191-1/+1
* | | | | Fix Gitlab::Metrics metaprogramming magicNick Thomas2017-04-211-5/+5
| |/ / / |/| | |
* | | | Merge branch 'fix/encoding-issue' into 'master' Sean McGivern2017-04-211-1/+7
|\ \ \ \
| * | | | Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING e...fix/encoding-issueJames Lopez2017-04-201-1/+7
* | | | | Merge branch 'add-email-receiver-metrics' into 'master' Douwe Maan2017-04-203-4/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Store projects in metrics for email repliesSean McGivern2017-04-202-4/+4
| * | | | Add metrics events for incoming emailsSean McGivern2017-04-201-0/+4
| |/ / /
* | | | Use constants in Gitlab::MarkupHelperDouwe Maan2017-04-201-9/+16
* | | | Refactor changing files in web UIDouwe Maan2017-04-202-31/+34
|/ / /
* | | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-192-0/+99
|\ \ \
| * | | Remove unused user activities codeSean McGivern2017-04-141-65/+0
| * | | Add a new Gitlab::UserActivities class to track user activitiesRémy Coutable2017-04-143-83/+34
| * | | Port 'Add user activities API' to CESean McGivern2017-04-143-0/+148
| * | | Add prometheus services to usage pingSean McGivern2017-04-141-0/+1
| * | | Add edition to usage pingSean McGivern2017-04-141-5/+8
| * | | Add Upload count to usage dataRobert Speicher2017-04-141-0/+1
| * | | Used named parameter for refreshing usage dataStan Hu2017-04-141-4/+4
| * | | Cache the last usage data to avoid unicorn timeoutsStan Hu2017-04-141-4/+4
| * | | Port 'Add uuid to usage ping' to CESean McGivern2017-04-141-1/+4
| * | | Track Mattermost usageZ.J. van de Weg2017-04-141-1/+2