Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '26943-fix-user-in-build-presenter' into 'master' | Robert Speicher | 2017-01-27 | 3 | -17/+19 |
|\ | |||||
| * | Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee already...26943-fix-user-in-build-presenter | Rémy Coutable | 2017-01-25 | 1 | -4/+3 |
| * | Don't override presentee methods for Gitlab::View::Presenter::Delegated | Rémy Coutable | 2017-01-24 | 3 | -17/+20 |
* | | Merge branch 'fix-trace-reader-encoding' into 'master' | Douwe Maan | 2017-01-26 | 1 | -2/+14 |
|\ \ | |||||
| * | | Make sure TraceReader uses Encoding.default_externalfix-trace-reader-encoding | Lin Jen-Shin | 2017-01-26 | 1 | -2/+14 |
* | | | Merge branch 'rs-empty_project-lib' into 'master' | Rémy Coutable | 2017-01-26 | 65 | -103/+114 |
|\ \ \ | |||||
| * | | | Use `:empty_project` where possible throughout spec/librs-empty_project-lib | Robert Speicher | 2017-01-25 | 65 | -103/+114 |
* | | | | Revert "Make sure TraceReader uses Encoding.default_external" | Lin Jen-Shin | 2017-01-26 | 1 | -14/+2 |
* | | | | Make sure TraceReader uses Encoding.default_external | Lin Jen-Shin | 2017-01-26 | 1 | -2/+14 |
| |/ / |/| | | |||||
* | | | Merge branch 'copy-as-md' into 'master' | Jacob Schatz | 2017-01-25 | 1 | -4/+4 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into copy-as-md | Douwe Maan | 2017-01-25 | 2 | -20/+72 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into copy-as-md | Douwe Maan | 2017-01-24 | 17 | -123/+806 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into copy-as-md | Douwe Maan | 2017-01-19 | 32 | -137/+525 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix SyntaxHighlightFilter spec | Douwe Maan | 2017-01-17 | 1 | -4/+4 |
* | | | | | | | Merge branch 'refresh-authorizations-fork-join' into 'master' | Douwe Maan | 2017-01-25 | 4 | -0/+106 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-join | Yorick Peterse | 2017-01-25 | 4 | -0/+106 |
* | | | | | | | Merge branch 'no_project_notes' into 'master' | Sean McGivern | 2017-01-25 | 1 | -0/+24 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | address comments | Jarka Kadlecova | 2017-01-25 | 1 | -0/+3 |
| * | | | | | | make mentions working when project not specified | Jarka Kadlecova | 2017-01-18 | 1 | -0/+21 |
* | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' | Robert Speicher | 2017-01-24 | 1 | -20/+48 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Revert "Merge branch 'revert-9cac0317' into 'master' " | Grzegorz Bizon | 2017-01-23 | 1 | -20/+48 |
* | | | | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into 'mast... | Sean McGivern | 2017-01-24 | 1 | -0/+115 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Allows to search within project by commit's hash | YarNayar | 2017-01-24 | 1 | -0/+115 |
* | | | | | | | Merge branch '22619-add-an-email-address-to-unsubscribe-list-header-in-email'... | Douwe Maan | 2017-01-23 | 5 | -3/+106 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Handles unsubscribe from notifications via email | Pawel Chojnacki | 2017-01-13 | 5 | -3/+106 |
* | | | | | | | | Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master' | Douwe Maan | 2017-01-23 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Allow creating protected branch when it doesn't exist | Pawel Chojnacki | 2017-01-13 | 1 | -1/+8 |
* | | | | | | | | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' | Kamil Trzciński | 2017-01-23 | 7 | -110/+471 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Extend pipeline detailed status factory specs | Grzegorz Bizon | 2017-01-12 | 1 | -17/+28 |
| * | | | | | | | Fix a Rubocop offense in detailed status factory | Grzegorz Bizon | 2017-01-12 | 1 | -1/+1 |
| * | | | | | | | Use detailed status for failed but allowed builds | Grzegorz Bizon | 2017-01-12 | 1 | -12/+113 |
| * | | | | | | | Expose methods that match statuses in status factories | Grzegorz Bizon | 2017-01-12 | 1 | -17/+45 |
| * | | | | | | | Make it possible to combine extended CI/CD statuses | Grzegorz Bizon | 2017-01-12 | 1 | -7/+90 |
| * | | | | | | | Add extended status for build failed but allowed to | Grzegorz Bizon | 2017-01-11 | 1 | -0/+110 |
| * | | | | | | | Add specs for two new methods defined in stage class | Grzegorz Bizon | 2017-01-11 | 1 | -1/+0 |
| * | | | | | | | Add concrete success warning status to stage factory | Grzegorz Bizon | 2017-01-11 | 4 | -71/+100 |
| * | | | | | | | Extract abstract success with warnings CI/CD status | Grzegorz Bizon | 2017-01-11 | 2 | -2/+2 |
* | | | | | | | | Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'ma... | Grzegorz Bizon | 2017-01-21 | 1 | -48/+20 |
* | | | | | | | | Merge branch 'fix/import-users' into 'master' | Rémy Coutable | 2017-01-20 | 2 | -9/+83 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix member mapper specfix/import-users | James Lopez | 2017-01-20 | 1 | -24/+1 |
| * | | | | | | | | fix and refactor note user mapping | James Lopez | 2017-01-18 | 2 | -9/+38 |
| * | | | | | | | | added spec replicating the problem | James Lopez | 2017-01-18 | 2 | -2/+59 |
| * | | | | | | | | do not map usersat all unless admin | James Lopez | 2017-01-18 | 1 | -1/+12 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' | Robert Speicher | 2017-01-20 | 1 | -20/+48 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-env | Rémy Coutable | 2017-01-15 | 1 | -20/+48 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'feature/gitaly-feature-flag' into 'master' | Robert Speicher | 2017-01-19 | 1 | -0/+23 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flag | Ahmad Sherif | 2017-01-18 | 1 | -0/+23 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch '23563-document-presenters' into 'master' | Dmitriy Zaporozhets | 2017-01-19 | 4 | -0/+147 |
|\ \ \ \ \ \ | |||||
| * | | | | | | More improvements to presenters23563-document-presenters | Rémy Coutable | 2017-01-18 | 4 | -50/+51 |
| * | | | | | | Improve presenter factory | Rémy Coutable | 2017-01-18 | 2 | -48/+42 |