Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs-event-traits' into 'master' | Rémy Coutable | 2017-02-03 | 2 | -10/+10 |
|\ | |||||
| * | Add traits for the different Event types to the Event factoryrs-event-traits | Robert Speicher | 2017-02-01 | 2 | -10/+10 |
* | | Merge branch 'markdown-plantuml' into 'master' | Sean McGivern | 2017-02-03 | 1 | -0/+32 |
|\ \ | |||||
| * | | PlantUML support for Markdown | Horacio Sanson | 2017-02-03 | 1 | -0/+32 |
* | | | Merge branch 'squash' into 'master' | Sean McGivern | 2017-02-03 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | Backport changes from EE squash | Sean McGivern | 2017-02-03 | 1 | -1/+3 |
| |/ / | |||||
* | | | Merge branch 'fwn-to-find-by-full-path' into 'master' | Dmitriy Zaporozhets | 2017-02-03 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | replace `find_with_namespace` with `find_by_full_path` | Adam Pahlevi | 2017-02-03 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'fix-git-hooks-when-creating-file' into 'master' | Douwe Maan | 2017-02-02 | 4 | -24/+26 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-file | Lin Jen-Shin | 2017-02-02 | 23 | -125/+395 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2017-01-26 | 65 | -101/+114 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2017-01-26 | 82 | -334/+5246 |
| |\ \ \ \ | |||||
| * | | | | | Fix renaming | Lin Jen-Shin | 2017-01-07 | 1 | -3/+3 |
| * | | | | | Merge branch 'master' into fix-git-hooks-when-creating-file | Lin Jen-Shin | 2017-01-04 | 78 | -445/+2658 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2016-12-10 | 7 | -3/+121 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2016-12-08 | 25 | -123/+1194 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | rubocop prefers lisp style | Lin Jen-Shin | 2016-12-08 | 2 | -6/+2 |
| * | | | | | | | | Fix tests to use the new API | Lin Jen-Shin | 2016-12-08 | 3 | -21/+25 |
* | | | | | | | | | Merge branch '20248-add-coverage-regex-in-job-yaml' into 'master' | Douwe Maan | 2017-02-02 | 5 | -6/+114 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Be more lenient on build coverage value updates and fix specs | Leandro Camargo | 2017-01-25 | 1 | -0/+1 |
| * | | | | | | | | | Make more code improvements around the '/' stripping logic | Leandro Camargo | 2017-01-25 | 3 | -5/+12 |
| * | | | | | | | | | Force coverage value to always be surrounded by '/' | Leandro Camargo | 2017-01-25 | 2 | -14/+9 |
| * | | | | | | | | | Improve specs styles/organization and add some more specs | Leandro Camargo | 2017-01-25 | 3 | -14/+31 |
| * | | | | | | | | | Comply to more requirements and requests made in the code review | Leandro Camargo | 2017-01-25 | 1 | -2/+7 |
| * | | | | | | | | | Simplify coverage setting and comply to some requests in code review | Leandro Camargo | 2017-01-25 | 2 | -20/+11 |
| * | | | | | | | | | Add specs to cover the implemented feature and fix a small bug | Leandro Camargo | 2017-01-25 | 4 | -5/+97 |
* | | | | | | | | | | Merge branch 'snippet-spam' into 'master' | Rémy Coutable | 2017-02-02 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Check public snippets for spam | Sean McGivern | 2017-02-02 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'jej-backport-active-tense-specs' into 'master' | Douwe Maan | 2017-02-02 | 4 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Active tense test coveragejej-backport-active-tense-specs | Valery Sizov | 2017-02-01 | 4 | -7/+7 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '24462-reduce_ldap_queries_for_lfs' into 'master' | Robert Speicher | 2017-02-01 | 1 | -26/+70 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms | Drew Blessing | 2017-01-30 | 1 | -26/+70 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'zj-format-chat-messages' into 'master' | Kamil Trzciński | 2017-02-01 | 10 | -70/+228 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Incorporate feedback | Z.J. van de Weg | 2017-01-30 | 2 | -5/+11 |
| * | | | | | | | | | Rename presenters for consitency | Z.J. van de Weg | 2017-01-30 | 5 | -4/+21 |
| * | | | | | | | | | Incorporate feedback | Z.J. van de Weg | 2017-01-30 | 9 | -9/+282 |
| * | | | | | | | | | Chat Commands have presenters | Z.J. van de Weg | 2017-01-30 | 13 | -341/+203 |
| |/ / / / / / / / | |||||
* | | | | | | | | | update specfix/import-user-validation-error | James Lopez | 2017-01-31 | 1 | -6/+2 |
* | | | | | | | | | add spec replicating validation error | James Lopez | 2017-01-31 | 1 | -0/+28 |
* | | | | | | | | | Merge branch '25910-convert-manual-action-icons-to-svg-to-propperly-position-... | Kamil Trzciński | 2017-01-31 | 4 | -4/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix broken tests | Filipa Lacerda | 2017-01-25 | 4 | -4/+4 |
* | | | | | | | | | | fix typo in spec | James Lopez | 2017-01-30 | 1 | -1/+1 |
* | | | | | | | | | | programmatically remove encrypted attributes. Added relevant spec. | James Lopez | 2017-01-30 | 1 | -0/+11 |
* | | | | | | | | | | fix spec failures | James Lopez | 2017-01-30 | 1 | -2/+2 |
* | | | | | | | | | | fix typo | James Lopez | 2017-01-30 | 1 | -2/+2 |
* | | | | | | | | | | Ignore encrypted attributes in Import/Export | James Lopez | 2017-01-30 | 2 | -4/+23 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |