Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix-migration-helper-race-conditions' into 'master' | Rémy Coutable | 2016-06-13 | 1 | -0/+13 |
|\ | |||||
| * | Handle NULL migration errors in migration helpers | Yorick Peterse | 2016-06-13 | 1 | -0/+13 |
* | | Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master' | Rémy Coutable | 2016-06-13 | 1 | -0/+1 |
|\ \ | |||||
| * | | Only show branches for revert / cherry-pick18377-cherry-pick-crashes-when-choosing-a-tag | Sean McGivern | 2016-06-13 | 1 | -0/+1 |
* | | | Merge branch 'issue_3359_2' into 'master' | Douwe Maan | 2016-06-13 | 2 | -13/+289 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Remove notification level fild from users, improve migrations and specsissue_3359_2 | Felipe Artur | 2016-06-10 | 1 | -3/+4 |
| * | | Remove notification level from user model | Felipe Artur | 2016-06-10 | 2 | -11/+286 |
* | | | Improved SVG sanitizer specs to include smoke tests for clean.bug/svg_sanitizer | Gabriel Mazetto | 2016-06-12 | 1 | -0/+16 |
* | | | Refactored SVG sanitizer | Gabriel Mazetto | 2016-06-12 | 1 | -0/+18 |
* | | | Refactor SVG sanitizer and prevent `xlink:href` to refer to external resources | Gabriel Mazetto | 2016-06-12 | 1 | -3/+15 |
* | | | Fix SVG whitelisting to allow namespaced attributes | Gabriel Mazetto | 2016-06-12 | 1 | -0/+48 |
* | | | Merge branch 'fix-closes-issues-error-500' into 'master' | Robert Speicher | 2016-06-12 | 1 | -0/+15 |
|\ \ \ | |||||
| * | | | Fix Error 500 when using closes_issues API with an external issue tracker | Stan Hu | 2016-06-11 | 1 | -0/+15 |
* | | | | Merge branch '18417-nav-offscreen' into 'master' | Dmitriy Zaporozhets | 2016-06-11 | 1 | -3/+5 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix preferences_spec test18417-nav-offscreen | Annabel Dunstone | 2016-06-10 | 1 | -3/+5 |
* | | | | Merge branch 'finding-multiple-projects-by-paths' into 'master' | Robert Speicher | 2016-06-10 | 1 | -0/+33 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Add Project.where_paths_infinding-multiple-projects-by-paths | Yorick Peterse | 2016-06-10 | 1 | -0/+33 |
* | | | | Merge branch 'workhorse-helpers' into 'master' | Robert Speicher | 2016-06-10 | 4 | -4/+7 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into workhorse-helpers | Douwe Maan | 2016-06-10 | 32 | -341/+865 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Add send_git_diff helper | Douwe Maan | 2016-06-08 | 62 | -811/+2631 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add workhorse controller and API helpers | Douwe Maan | 2016-06-06 | 3 | -3/+6 |
* | | | | | | | Merge branch 'ci-page-ui-update' into 'master' | Jacob Schatz | 2016-06-10 | 1 | -16/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Updated testsci-page-ui-update | Phil Hughes | 2016-06-10 | 1 | -1/+1 |
| * | | | | | | | Fixed failing tests | Phil Hughes | 2016-06-10 | 1 | -2/+4 |
| * | | | | | | | CI build page UI update | Phil Hughes | 2016-06-10 | 1 | -19/+8 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'user-search-dropdown' into 'master' | Jacob Schatz | 2016-06-10 | 1 | -36/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | removed tests needed for any author :poop:user-search-dropdown | Phil Hughes | 2016-06-10 | 1 | -36/+0 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'label-filter-fix' into 'master' | Jacob Schatz | 2016-06-10 | 1 | -0/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Added testslabel-filter-fix | Phil Hughes | 2016-06-09 | 1 | -0/+15 |
* | | | | | | | | Merge branch 'rename-ci-commit-phase-4' into 'master' | Rémy Coutable | 2016-06-10 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-4 | Kamil Trzcinski | 2016-06-10 | 6 | -17/+171 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Rename commit to pipeline in TriggerRequest | Kamil Trzcinski | 2016-06-09 | 2 | -2/+2 |
* | | | | | | | | Fixing specs stubbed objects cannot access database | Paco Guzman | 2016-06-10 | 3 | -4/+4 |
* | | | | | | | | Cache the presence of an issue_tracker at project level | Paco Guzman | 2016-06-10 | 2 | -0/+96 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Rename ci_commit -> pipeline | Rémy Coutable | 2016-06-10 | 2 | -18/+18 |
* | | | | | | | Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergea... | Rémy Coutable | 2016-06-10 | 2 | -33/+38 |
* | | | | | | | Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'... | Rémy Coutable | 2016-06-10 | 3 | -64/+96 |
* | | | | | | | Allow or not merge MR with failed build | Rui Anderson | 2016-06-10 | 3 | -0/+230 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Fix failing `EmailOnPush` spec. | Timothy Andrew | 2016-06-10 | 1 | -2/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'award-emoji-fixes' into 'master' | Jacob Schatz | 2016-06-09 | 1 | -7/+6 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes | Fatih Acet | 2016-06-09 | 1 | -2/+28 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes | Fatih Acet | 2016-06-09 | 1 | -1/+82 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes | Fatih Acet | 2016-06-09 | 18 | -99/+146 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Move award_menu_url variable into gon object. | Fatih Acet | 2016-06-09 | 1 | -7/+6 |
* | | | | | | | Merge branch 'due-date-field-ux-improv' into 'master' | Jacob Schatz | 2016-06-09 | 1 | -5/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed tests | Phil Hughes | 2016-06-09 | 1 | -5/+7 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'issue_17607' into 'master' | Jacob Schatz | 2016-06-09 | 1 | -0/+46 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Change date format to be non zero padded in order to fix failing test | Alfredo Sumaran | 2016-06-09 | 1 | -1/+1 |
| * | | | | | | Add tests for dates on tooltips | Alfredo Sumaran | 2016-06-09 | 1 | -0/+46 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Toggling a task in a description with mentions doesn't creates a Todo | Douglas Barbosa Alexandre | 2016-06-09 | 1 | -2/+28 |
|/ / / / / |