summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master' Sean McGivern2017-04-253-5/+5
|\
| * Don't display the `is_admin?` flag for user API responses.Timothy Andrew2017-04-253-5/+5
* | Merge branch 'gitaly-testing-toml' into 'master' Rémy Coutable2017-04-251-0/+37
|\ \
| * | Configure Gitaly through settings file instead of ENV varsgitaly-testing-tomlAlejandro Rodríguez2017-04-181-0/+37
* | | 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 'mrchrisw-22740-merge-api' into 'master' Sean McGivern2017-04-241-3/+4
|\ \ \ \ \ \
| * | | | | | Fix updating merge_when_build_succeeds via merge API endpointmrchrisw-22740-merge-apiChris Wilson2017-04-241-3/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'db-backup-ssl-support' into 'master' Achilleas Pipinellis2017-04-241-5/+21
|\ \ \ \ \ \
| * | | | | | Database SSL support for backup script.Guillaume2017-04-051-5/+21
* | | | | | | 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
* | | | | | | Start versioning cached markdown fieldsNick Thomas2017-04-211-14/+7
* | | | | | | Remove the ClearDatabaseCacheWorkerNick Thomas2017-04-211-6/+1
* | | | | | | Fix Gitlab::Metrics metaprogramming magicNick Thomas2017-04-211-5/+5
* | | | | | | Remove a use of module_functionNick Thomas2017-04-211-12/+10
| |_|/ / / / |/| | | | |
* | | | | | 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 'fix-jobs-enabled-parameter' into 'master'Sean McGivern2017-04-211-2/+5
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Replace builds_enabled with jobs_enabled in projects API v4 (!10786)winniehell2017-04-201-2/+5
* | | | | | | 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
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'issuable-state-custom-links' into 'master' Sean McGivern2017-04-201-2/+2
|\ \ \ \ \ \
| * | | | | | Do not append issuable state to links with custom anchorissuable-state-custom-linksAdam Niedzielski2017-04-191-2/+2
| |/ / / / /
* | | | | | Merge branch 'plantuml-filter-after-highlight' into 'master' Sean McGivern2017-04-201-4/+4
|\ \ \ \ \ \
| * | | | | | Fix PlantUML integration in GFMplantuml-filter-after-highlightAdam Niedzielski2017-04-191-4/+4
* | | | | | | Use constants in Gitlab::MarkupHelperDouwe Maan2017-04-201-9/+16
* | | | | | | Refactor changing files in web UIDouwe Maan2017-04-206-39/+42
* | | | | | | Merge branch 'query-users-by-extern-uid' into 'master'Robert Speicher2017-04-191-8/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Implement search by extern_uid in Users APIRobin Bobbitt2017-04-181-8/+14
* | | | | | | Merge branch 'issuable-state-only-notes-and-description' into 'master' Sean McGivern2017-04-191-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Display issuable state only in notes and issuable descriptionAdam Niedzielski2017-04-191-0/+2
* | | | | | | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-197-1/+130
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove unused user activities codeSean McGivern2017-04-144-78/+1
| * | | | | | Expose `last_activity_on` in the User APIRémy Coutable2017-04-142-9/+9
| * | | | | | 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-146-1/+172
| * | | | | | Remove user activities table and use redis instead of PG for recording activi...James Lopez2017-04-141-0/+7
| * | | | | | Add user activity service and spec. Also added relevant - NOT offline - migra...James Lopez2017-04-141-0/+12
| * | | | | | 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
View Lorry Controller Status