Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/27280-fix-unititalized-constant | Rémy Coutable | 2017-01-27 | 2 | -0/+0 |
* | Move ApplicationSetting DEFAULTS to `.defaults` instead | Rémy Coutable | 2017-01-27 | 1 | -2/+2 |
* | Merge branch '26943-fix-user-in-build-presenter' into 'master' | Robert Speicher | 2017-01-27 | 2 | -0/+6 |
|\ | |||||
| * | Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee already...26943-fix-user-in-build-presenter | Rémy Coutable | 2017-01-25 | 2 | -2/+6 |
| * | Don't override presentee methods for Gitlab::View::Presenter::Delegated | Rémy Coutable | 2017-01-24 | 1 | -1/+3 |
* | | Make sure TraceReader uses Encoding.default_externalfix-trace-reader-encoding | Lin Jen-Shin | 2017-01-26 | 1 | -0/+1 |
* | | Merge branch 'copy-as-md' into 'master' | Jacob Schatz | 2017-01-25 | 5 | -6/+16 |
|\ \ | |||||
| * \ | Merge branch 'master' into copy-as-md | Douwe Maan | 2017-01-25 | 8 | -45/+29 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into copy-as-md | Douwe Maan | 2017-01-24 | 32 | -174/+370 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into copy-as-md | Douwe Maan | 2017-01-19 | 50 | -235/+744 |
| |\ \ \ \ | |||||
| * | | | | | Add more SyntaxHighlightFilter and MathFilter tests | Douwe Maan | 2017-01-17 | 1 | -2/+4 |
| * | | | | | Fix SyntaxHighlightFilter spec | Douwe Maan | 2017-01-17 | 1 | -0/+1 |
| * | | | | | Improve spec | Douwe Maan | 2017-01-16 | 1 | -3/+4 |
| * | | | | | Copying a rendered issue/comment will paste into GFM textareas as actual GFM | Douwe Maan | 2017-01-16 | 5 | -6/+12 |
* | | | | | | Merge branch 'refresh-authorizations-fork-join' into 'master' | Douwe Maan | 2017-01-25 | 4 | -0/+116 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-join | Yorick Peterse | 2017-01-25 | 4 | -0/+116 |
* | | | | | | | Merge branch 'fix-ci-requests-concurrency' into 'master' | Grzegorz Bizon | 2017-01-25 | 1 | -9/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Return struct instead of multiple values | Kamil Trzcinski | 2017-01-25 | 1 | -5/+5 |
| * | | | | | | | Fix specs | Kamil Trzcinski | 2017-01-25 | 1 | -0/+1 |
| * | | | | | | | Fix picking CI builds | Kamil Trzcinski | 2017-01-25 | 1 | -9/+15 |
* | | | | | | | | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' | Grzegorz Bizon | 2017-01-25 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Remove unneeded code and fix offensesbackport-ee-changes-for-build-minutes | Kamil Trzcinski | 2017-01-25 | 2 | -25/+1 |
| * | | | | | | Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui... | Kamil Trzcinski | 2017-01-24 | 30 | -172/+352 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_... | Kamil Trzcinski | 2017-01-20 | 3 | -2/+27 |
* | | | | | | | Merge branch 'no_project_notes' into 'master' | Sean McGivern | 2017-01-25 | 3 | -4/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | address comments | Jarka Kadlecova | 2017-01-25 | 1 | -0/+1 |
| * | | | | | | | make mentions working when project not specified | Jarka Kadlecova | 2017-01-18 | 3 | -5/+8 |
* | | | | | | | | Merge branch 'grapify-branch-api' into 'master' | Rémy Coutable | 2017-01-25 | 1 | -6/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Grapify last endpoint of the branches APIgrapify-branch-api | Robert Schilling | 2017-01-24 | 1 | -6/+1 |
* | | | | | | | | | Merge branch 'mrchrisw/rake-redis' into 'master' | Stan Hu | 2017-01-25 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add redis version to info rake taskmrchrisw/rake-redis | Chris Wilson | 2017-01-24 | 1 | -1/+4 |
* | | | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' | Robert Speicher | 2017-01-24 | 3 | -34/+16 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Rescue from ActiveRecord::UnknownAttributeError and fallback to fake settingsdont-persist-application-settings-in-test-env-bis | Rémy Coutable | 2017-01-23 | 2 | -5/+3 |
| * | | | | | | | | Revert "Merge branch 'revert-9cac0317' into 'master' " | Grzegorz Bizon | 2017-01-23 | 2 | -32/+16 |
* | | | | | | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into 'mast... | Sean McGivern | 2017-01-24 | 2 | -1/+31 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Search feature: redirects to commit page if query is commit sha and only comm... | YarNayar | 2017-01-24 | 2 | -1/+13 |
| * | | | | | | | | | Allows to search within project by commit's hash | YarNayar | 2017-01-24 | 1 | -1/+19 |
* | | | | | | | | | | Merge branch 'zj-mattermost-api-update' into 'master' | Grzegorz Bizon | 2017-01-24 | 3 | -8/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Small update to the Mattermost APIzj-mattermost-api-update | Z.J. van de Weg | 2017-01-24 | 3 | -8/+18 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'grapify-deploy-keys' into 'master' | Rémy Coutable | 2017-01-24 | 1 | -9/+8 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Grapify all endpoints of the deploy keys APIgrapify-deploy-keys | Robert Schilling | 2017-01-23 | 1 | -9/+8 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rs-pick-security-fixes' into 'master' | Robert Speicher | 2017-01-23 | 7 | -37/+44 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Merge branch 'fix-guest-access-posting-to-notes' into 'security' | Robert Speicher | 2017-01-23 | 1 | -10/+16 |
| * | | | | | | | | | Merge branch 'fix-api-mr-permissions' into 'security' | Robert Speicher | 2017-01-23 | 5 | -24/+21 |
| * | | | | | | | | | Merge branch 'fix-users-deleting-public-deployment-keys' into 'security' | Robert Speicher | 2017-01-23 | 1 | -3/+7 |
* | | | | | | | | | | Merge branch '22619-add-an-email-address-to-unsubscribe-list-header-in-email'... | Douwe Maan | 2017-01-23 | 7 | -46/+103 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Handles unsubscribe from notifications via email | Pawel Chojnacki | 2017-01-13 | 7 | -46/+103 |
* | | | | | | | | | | | Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master' | Douwe Maan | 2017-01-23 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Allow creating protected branch when it doesn't exist | Pawel Chojnacki | 2017-01-13 | 1 | -1/+3 |
* | | | | | | | | | | | Merge branch '22974-trigger-service-events-through-api' into 'master' | Douwe Maan | 2017-01-23 | 1 | -3/+45 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | |