Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'Add-a-shash-command-for-target-merge-request-branch' into 'master' | Sean McGivern | 2017-02-03 | 2 | -0/+106 |
|\ | |||||
| * | Adds /target_branch slash command functionality for merge requests | YarNayar | 2017-02-03 | 2 | -0/+106 |
* | | Merge branch '17662-rename-builds' into 'master' | Kamil TrzciĆski | 2017-02-03 | 10 | -124/+124 |
|\ \ | |||||
| * | | Fix broken tests17662-rename-builds | Filipa Lacerda | 2017-02-03 | 10 | -124/+124 |
* | | | Merge branch 'ref-switcher-perf' into 'master' | Jacob Schatz | 2017-02-03 | 1 | -2/+3 |
|\ \ \ | |||||
| * | | | Fixed up tests | Phil Hughes | 2016-11-21 | 1 | -2/+3 |
* | | | | 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 | 4 | -6/+17 |
|\ \ \ \ | |||||
| * | | | | Backport changes from EE squash | Sean McGivern | 2017-02-03 | 4 | -6/+17 |
| |/ / / | |||||
* | | | | Merge branch 'fwn-to-find-by-full-path' into 'master' | Dmitriy Zaporozhets | 2017-02-03 | 3 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | replace `find_with_namespace` with `find_by_full_path` | Adam Pahlevi | 2017-02-03 | 3 | -8/+8 |
* | | | | | Merge branch '24606-force-password-reset-on-next-login' into 'master' | Sean McGivern | 2017-02-03 | 1 | -0/+7 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Update api docs and minor changes | George Andrinopoulos | 2017-02-02 | 1 | -2/+3 |
| * | | | | Force new password after password reset via API | George Andrinopoulos | 2017-02-02 | 1 | -0/+6 |
* | | | | | Merge branch 'fix-git-hooks-when-creating-file' into 'master' | Douwe Maan | 2017-02-02 | 18 | -113/+277 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-file | Lin Jen-Shin | 2017-02-02 | 163 | -686/+2123 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2017-01-26 | 150 | -257/+290 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | We don't care about the return value now | Lin Jen-Shin | 2017-01-26 | 1 | -1/+1 |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2017-01-26 | 376 | -3736/+17364 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix renaming | Lin Jen-Shin | 2017-01-07 | 4 | -7/+7 |
| * | | | | | | | | Remove tag with git hooks | Lin Jen-Shin | 2017-01-05 | 1 | -2/+3 |
| * | | | | | | | | Merge branch 'master' into fix-git-hooks-when-creating-file | Lin Jen-Shin | 2017-01-04 | 313 | -2035/+10372 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Unify parameters and callback after hooks | Lin Jen-Shin | 2016-12-14 | 2 | -5/+4 |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2016-12-12 | 15 | -47/+263 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2016-12-10 | 37 | -189/+899 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Pass source_commit so that we save a few lookups | Lin Jen-Shin | 2016-12-10 | 1 | -5/+23 |
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2016-12-08 | 89 | -522/+2850 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | 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 | 11 | -36/+122 |
| * | | | | | | | | | | | | Introduce Repository#with_tmp_ref which we need | Lin Jen-Shin | 2016-12-08 | 1 | -3/+3 |
| * | | | | | | | | | | | | Cleanup parameters, easier to understand and | Lin Jen-Shin | 2016-12-08 | 1 | -28/+58 |
| * | | | | | | | | | | | | Commit outside the hooks if possible: | Lin Jen-Shin | 2016-12-07 | 1 | -1/+1 |
| * | | | | | | | | | | | | Re-enable tests for update_branch_with_hooks and | Lin Jen-Shin | 2016-12-06 | 1 | -12/+38 |
| * | | | | | | | | | | | | Fix update_ref! call in the test | Lin Jen-Shin | 2016-12-06 | 1 | -1/+2 |
| * | | | | | | | | | | | | Introduce GitOperationService and wrap every | Lin Jen-Shin | 2016-12-06 | 1 | -6/+6 |
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2016-12-03 | 185 | -2255/+4049 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2016-11-24 | 47 | -861/+1381 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2016-11-22 | 225 | -1017/+6681 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati... | Lin Jen-Shin | 2016-11-15 | 152 | -667/+3649 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Add a test to make sure hooks are fire only once | Lin Jen-Shin | 2016-11-05 | 1 | -14/+15 |
* | | | | | | | | | | | | | | | | | Merge branch 'fix-frontend-test-failures' into 'master' | Alfredo Sumaran | 2017-02-02 | 13 | -33/+47 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | use setFixtures instead of fixture.set | Mike Greiling | 2017-02-02 | 1 | -7/+6 |
| * | | | | | | | | | | | | | | | | | prevent u2f tests from triggering a form submission while testing | Mike Greiling | 2017-02-02 | 1 | -8/+8 |
| * | | | | | | | | | | | | | | | | | simplify test for focus state | Mike Greiling | 2017-02-02 | 1 | -5/+1 |
| * | | | | | | | | | | | | | | | | | preload projects.json fixture | Mike Greiling | 2017-02-02 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | | preload projects.json fixture | Mike Greiling | 2017-02-02 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | | rework tests which rely on teaspoon-specific behavior | Mike Greiling | 2017-02-02 | 1 | -5/+9 |
| * | | | | | | | | | | | | | | | | | use setFixtures instead of fixture.set | Mike Greiling | 2017-02-02 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | ensure helper classes and constants are exposed globally | Mike Greiling | 2017-02-02 | 3 | -3/+12 |