Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Decrease Cyclomatic Complexity threshold to 16 | Maxim Rydkin | 2017-04-26 | 1 | -40/+30 |
* | Merge branch '20378-natural-sort-issue-numbers' into 'master' | Sean McGivern | 2017-04-26 | 1 | -0/+29 |
|\ | |||||
| * | Change issues sentence to use natural sorting | Jeff Stubler | 2017-04-25 | 1 | -0/+29 |
* | | Merge branch '31280-skip-issueables-without-project' into 'master' | Sean McGivern | 2017-04-26 | 1 | -1/+5 |
|\ \ | |||||
| * | | issues_for_nodes => issuables_for_nodes31280-skip-issueables-without-project | Lin Jen-Shin | 2017-04-26 | 1 | -3/+3 |
| * | | Follow feedback on the review | Lin Jen-Shin | 2017-04-26 | 1 | -4/+4 |
| * | | Skip issuable without a project in IssuableExtractor#extract | Lin Jen-Shin | 2017-04-25 | 1 | -1/+5 |
* | | | Merge branch 'mr-diff-size-overflow' into 'master' | Douwe Maan | 2017-04-25 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | Show correct size when MR diff overflows | Sean McGivern | 2017-04-25 | 1 | -0/+4 |
* | | | | Merge branch 'dm-fix-oauth-user-creation' into 'master' | Robert Speicher | 2017-04-25 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creation | Douwe Maan | 2017-04-24 | 1 | -1/+1 |
* | | | | Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master' | Sean McGivern | 2017-04-25 | 3 | -5/+5 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Don't display the `is_admin?` flag for user API responses. | Timothy Andrew | 2017-04-25 | 3 | -5/+5 |
* | | | | Merge branch 'gitaly-testing-toml' into 'master' | Rémy Coutable | 2017-04-25 | 1 | -0/+37 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Configure Gitaly through settings file instead of ENV varsgitaly-testing-toml | Alejandro Rodríguez | 2017-04-18 | 1 | -0/+37 |
* | | | | Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master' | Sean McGivern | 2017-04-24 | 1 | -1/+8 |
|\ \ \ \ | |||||
| * | | | | Fix commenting on an existing discussion on an unchanged line that is no long... | Douwe Maan | 2017-04-24 | 1 | -1/+8 |
* | | | | | Merge branch '30305-oauth-token-push-code' into 'master' | Rémy Coutable | 2017-04-24 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Allow OAuth clients to push code30305-oauth-token-push-code | Timothy Andrew | 2017-04-13 | 1 | -1/+1 |
* | | | | | | Merge branch 'email-handler-metrics' into 'master' | Sean McGivern | 2017-04-24 | 5 | -5/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make handler metric params more explicitemail-handler-metrics | Sean McGivern | 2017-04-21 | 5 | -5/+17 |
* | | | | | | | Merge branch 'mrchrisw-22740-merge-api' into 'master' | Sean McGivern | 2017-04-24 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix updating merge_when_build_succeeds via merge API endpointmrchrisw-22740-merge-api | Chris Wilson | 2017-04-24 | 1 | -3/+4 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'db-backup-ssl-support' into 'master' | Achilleas Pipinellis | 2017-04-24 | 1 | -5/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Database SSL support for backup script. | Guillaume | 2017-04-05 | 1 | -5/+21 |
* | | | | | | | | Merge branch 'workhorse-secret-path' into 'master' | Rémy Coutable | 2017-04-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Make location of gitlab_workhorse_secret configurable | Jakub Jirutka | 2017-04-19 | 1 | -1/+1 |
* | | | | | | | | Start versioning cached markdown fields | Nick Thomas | 2017-04-21 | 1 | -14/+7 |
* | | | | | | | | Remove the ClearDatabaseCacheWorker | Nick Thomas | 2017-04-21 | 1 | -6/+1 |
* | | | | | | | | Fix Gitlab::Metrics metaprogramming magic | Nick Thomas | 2017-04-21 | 1 | -5/+5 |
* | | | | | | | | Remove a use of module_function | Nick Thomas | 2017-04-21 | 1 | -12/+10 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'fix/encoding-issue' into 'master' | Sean McGivern | 2017-04-21 | 1 | -1/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING e...fix/encoding-issue | James Lopez | 2017-04-20 | 1 | -1/+7 |
* | | | | | | | | Merge branch 'fix-jobs-enabled-parameter' into 'master' | Sean McGivern | 2017-04-21 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Replace builds_enabled with jobs_enabled in projects API v4 (!10786) | winniehell | 2017-04-20 | 1 | -2/+5 |
* | | | | | | | | Merge branch 'add-email-receiver-metrics' into 'master' | Douwe Maan | 2017-04-20 | 3 | -4/+8 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Store projects in metrics for email replies | Sean McGivern | 2017-04-20 | 2 | -4/+4 |
| * | | | | | | | Add metrics events for incoming emails | Sean McGivern | 2017-04-20 | 1 | -0/+4 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'issuable-state-custom-links' into 'master' | Sean McGivern | 2017-04-20 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Do not append issuable state to links with custom anchorissuable-state-custom-links | Adam Niedzielski | 2017-04-19 | 1 | -2/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'plantuml-filter-after-highlight' into 'master' | Sean McGivern | 2017-04-20 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix PlantUML integration in GFMplantuml-filter-after-highlight | Adam Niedzielski | 2017-04-19 | 1 | -4/+4 |
* | | | | | | | | Use constants in Gitlab::MarkupHelper | Douwe Maan | 2017-04-20 | 1 | -9/+16 |
* | | | | | | | | Refactor changing files in web UI | Douwe Maan | 2017-04-20 | 6 | -39/+42 |
* | | | | | | | | Merge branch 'query-users-by-extern-uid' into 'master' | Robert Speicher | 2017-04-19 | 1 | -8/+14 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Implement search by extern_uid in Users API | Robin Bobbitt | 2017-04-18 | 1 | -8/+14 |
* | | | | | | | | Merge branch 'issuable-state-only-notes-and-description' into 'master' | Sean McGivern | 2017-04-19 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Display issuable state only in notes and issuable description | Adam Niedzielski | 2017-04-19 | 1 | -0/+2 |
* | | | | | | | | Merge branch 'usage-ping-port' into 'master' | Sean McGivern | 2017-04-19 | 7 | -1/+130 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Remove unused user activities code | Sean McGivern | 2017-04-14 | 4 | -78/+1 |