Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow merge when no pipeline success38389-allow-merge-without-success | Eric Eastwood | 2017-10-05 | 7 | -39/+38 |
* | Merge branch '37229-mr-widget-status-icon' into 'master' | Jacob Schatz | 2017-10-05 | 3 | -19/+89 |
|\ | |||||
| * | add changelog37229-mr-widget-status-icon | Simon Knox | 2017-10-03 | 1 | -0/+5 |
| * | Merge remote-tracking branch 'origin' into 37229-mr-widget-status-icon | Simon Knox | 2017-10-03 | 1089 | -7893/+12439 |
| |\ | |||||
| * | | improve merge request widget status icon UX | Simon Knox | 2017-09-20 | 2 | -19/+84 |
* | | | Merge branch 'winh-cleanup-select2-dropdowns' into 'master' | Annabel Dunstone Gray | 2017-10-04 | 1 | -99/+46 |
|\ \ \ | |||||
| * | | | Cleanup Select2 dropdown styles | Winnie Hellmann | 2017-10-04 | 1 | -99/+46 |
|/ / / | |||||
* | | | Merge branch 'mentions-in-comments' into 'master' | Annabel Dunstone Gray | 2017-10-04 | 4 | -6/+18 |
|\ \ \ | |||||
| * | | | Makes `@mentions links` have a different styling for better separation | Dimitrie Hoekstra | 2017-10-04 | 4 | -6/+18 |
|/ / / | |||||
* | | | Merge branch 'update-unf_ext-0.0.7.4' into 'master' | Rémy Coutable | 2017-10-04 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update unf_ext from 0.0.7.2 to 0.0.7.4 (#38368) | Lemures Lemniscati | 2017-09-30 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'docs/openid-connect' into 'master' | Rémy Coutable | 2017-10-04 | 2 | -0/+6 |
|\ \ \ | |||||
| * | | | Add link to OpenID Connect documentation | Markus Koller | 2017-09-19 | 2 | -0/+6 |
* | | | | Merge branch 'tag-link-size' into 'master' | Rémy Coutable | 2017-10-04 | 3 | -4/+9 |
|\ \ \ \ | |||||
| * | | | | Adjusts tag link to avoid underlining spaces | Guilherme Vieira | 2017-10-03 | 3 | -4/+9 |
* | | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2017-10-04 | 2 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Sidekiq::MemoryKiller: Add missing space in log message | Benjamin Drung | 2017-10-04 | 2 | -1/+6 |
* | | | | | | Merge branch 'merge-request-doco' into 'master' | Rémy Coutable | 2017-10-04 | 1 | -0/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | explain target_project_id vs project_id | David Turner | 2017-10-03 | 1 | -0/+9 |
* | | | | | | | Merge branch 'fix-edit-project-service-cancel-button-position' into 'master' | Rémy Coutable | 2017-10-04 | 2 | -1/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix edit project service cancel button position | Matt Coleman | 2017-09-29 | 2 | -1/+6 |
* | | | | | | | | Merge branch 'fork-layout-cleanup' into 'master' | Filipa Lacerda | 2017-10-04 | 5 | -108/+78 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fixed specsfork-layout-cleanup | Phil Hughes | 2017-10-02 | 2 | -1/+2 |
| * | | | | | | | | Cleanup the fork layout | Phil Hughes | 2017-10-02 | 4 | -107/+76 |
* | | | | | | | | | Merge branch '26890-fix-default-branches-sorting' into 'master' | Robert Speicher | 2017-10-04 | 5 | -147/+142 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix the default branches sorting to actually be 'Last updated'26890-fix-default-branches-sorting | Rémy Coutable | 2017-09-25 | 5 | -147/+142 |
* | | | | | | | | | | Merge branch 'docs/images-update' into 'master' | Job van der Voort | 2017-10-04 | 70 | -128/+99 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update a bunch of docs images | Achilleas Pipinellis | 2017-10-04 | 70 | -128/+99 |
* | | | | | | | | | | | Merge branch 'capture-rev-list-errors' into 'master' | Sean McGivern | 2017-10-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Include RevList error messages in exceptionscapture-rev-list-errors | Jacob Vosmaer | 2017-10-03 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'gitaly-fetch-ref' into 'master' | Sean McGivern | 2017-10-04 | 7 | -22/+80 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Let fetch_ref pull from Gitaly instead of from disk | Jacob Vosmaer | 2017-10-04 | 7 | -22/+80 |
* | | | | | | | | | | | | | Merge branch 'missing-exception-variable' into 'master' | Sean McGivern | 2017-10-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add missing exception variable | Jacob Vosmaer | 2017-10-04 | 1 | -1/+1 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'merge-request-notes-performance' into 'master' | Sean McGivern | 2017-10-04 | 4 | -10/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Use a UNION ALL for getting merge request notesmerge-request-notes-performance | Yorick Peterse | 2017-10-02 | 4 | -10/+33 |
* | | | | | | | | | | | | | Merge branch 'js-load-specific-locales' into 'master' | Phil Hughes | 2017-10-04 | 6 | -26/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Load only the currently needed JS locale file | Tim Zallmann | 2017-10-04 | 6 | -26/+19 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'fix_migration_with_fast_forward_option' into 'master' | Sean McGivern | 2017-10-04 | 3 | -3/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add a new migration to make sure that fast forward column exists in projects ...fix_migration_with_fast_forward_option | Valery Sizov | 2017-10-04 | 3 | -2/+29 |
| * | | | | | | | | | | | | Fix AddFastForwardOptionToProject migration | Valery Sizov | 2017-10-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge remote-tracking branch 'dev/master' | Jarka Kadlecova | 2017-10-04 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Jarka Kadlecova | 2017-10-04 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Jarka Kadlecova | 2017-10-04 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Update CHANGELOG.md for 9.5.7 | Jose Ivan Vargas | 2017-10-03 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | Merge branch '36742-hide-close-mr-button-on-merge' into 'master' | Fatih Acet | 2017-10-04 | 6 | -1/+67 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Hide close MR button after merge without reloading page | Jacopo | 2017-09-24 | 6 | -1/+67 |
* | | | | | | | | | | | | | | | Merge branch 'dm-pat-revoke' into 'master' | Sean McGivern | 2017-10-04 | 4 | -3/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Set default scope on PATs that don't have one set to allow them to be revokeddm-pat-revoke | Douwe Maan | 2017-10-03 | 4 | -3/+14 |
* | | | | | | | | | | | | | | | Merge branch 'icons-profile-icons' into 'master' | Phil Hughes | 2017-10-04 | 1 | -9/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |