Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'sidekiq-job-throttling' into 'master' | Douwe Maan | 2016-11-11 | 4 | -1/+44 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttling | Patricio Cano | 2016-11-11 | 2 | -3/+3 | |
| * | | | | | | | Allow the Sidekiq queues to throttle and the factor by which to throttle them... | Patricio Cano | 2016-11-10 | 4 | -1/+29 | |
| * | | | | | | | Allow certain Sidekiq jobs to be throttled | Patricio Cano | 2016-11-10 | 3 | -0/+15 | |
* | | | | | | | | Merge branch 'vue2' into 'master' | Fatih Acet | 2016-11-11 | 37 | -347/+350 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fixed tests for issue boards & diff note resolvingvue2 | Phil Hughes | 2016-11-10 | 1 | -0/+2 | |
| * | | | | | | | Fix Merge Conflicts app to make it work with Vue 2 | Alfredo Sumaran | 2016-11-10 | 4 | -27/+17 | |
| * | | | | | | | Changed how lists get sorted | Phil Hughes | 2016-11-10 | 3 | -2/+6 | |
| * | | | | | | | Issue board spec fixes | Phil Hughes | 2016-11-10 | 2 | -1/+3 | |
| * | | | | | | | Fixed jump to discussion button not showing | Phil Hughes | 2016-11-10 | 1 | -1/+5 | |
| * | | | | | | | Changed how resolving notes is rendered | Phil Hughes | 2016-11-10 | 4 | -35/+39 | |
| * | | | | | | | Remove unnecesarry require. | Fatih Acet | 2016-11-10 | 1 | -1/+0 | |
| * | | | | | | | Fixed up resolve discussions | Phil Hughes | 2016-11-10 | 8 | -27/+43 | |
| * | | | | | | | Refactor of issue boards to work with Vue2 | Phil Hughes | 2016-11-10 | 16 | -234/+225 | |
| * | | | | | | | VueJSMigration: Remove parallel-conflict-line component. | Fatih Acet | 2016-11-10 | 3 | -20/+11 | |
| * | | | | | | | Vue migration fix syntax highlighting. | Fatih Acet | 2016-11-10 | 1 | -1/+1 | |
| * | | | | | | | VueJS migration, replace {{{ with v-html | Fatih Acet | 2016-11-10 | 2 | -5/+3 | |
| * | | | | | | | Migrate Vue v1 to v2. | Fatih Acet | 2016-11-10 | 9 | -21/+23 | |
* | | | | | | | | Merge branch '19205-group-header-redesign' into 'master' | Annabel Dunstone Gray | 2016-11-11 | 7 | -53/+41 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 19205 Redesign group page header to match new navigation19205-group-header-redesign | tauriedavis | 2016-11-09 | 7 | -53/+41 | |
* | | | | | | | | | Merge branch '21764-build-page-title' into 'master' | Fatih Acet | 2016-11-11 | 4 | -8/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Removed soon-to-be un-needed project title additions from builds and environm...21764-build-page-title | Luke Bennett | 2016-11-09 | 4 | -8/+3 | |
* | | | | | | | | | | Merge branch '23520-mr-sticky-tabs-overlap-discussion-from-anchor' into 'mast... | Fatih Acet | 2016-11-11 | 2 | -2/+19 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Account for merge request fixed affix bar23520-mr-sticky-tabs-overlap-discussion-from-anchor | Luke Bennett | 2016-11-10 | 2 | -2/+19 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master' | Sean McGivern | 2016-11-11 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversion | Adam Niedzielski | 2016-11-10 | 2 | -2/+2 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'milestone-project-require' into 'master' | Sean McGivern | 2016-11-11 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Require projects before creating milestone | gfyoung | 2016-11-10 | 2 | -2/+2 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'use-config-param' into 'master' | Sean McGivern | 2016-11-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Use config param in `Repository#update_ref!` | teru | 2016-11-10 | 1 | -1/+1 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch '24369-remove-additional-padding' into 'master' | Annabel Dunstone Gray | 2016-11-10 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove additional padding on right-aligned items in MR widget. | Didem Acet | 2016-11-10 | 1 | -0/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch '24279-issue-merge-request-sidebar-todo-button-style-improvement... | Annabel Dunstone Gray | 2016-11-10 | 1 | -14/+0 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | removed gray button styling from todo buttons in sidebars24279-issue-merge-request-sidebar-todo-button-style-improvement | Dimitrie Hoekstra | 2016-11-10 | 1 | -14/+0 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch '24353-skipped-icon' into 'master' | Fatih Acet | 2016-11-10 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix alignment of status icons in commit message list24353-skipped-icon | Annabel Dunstone Gray | 2016-11-10 | 1 | -0/+2 | |
| * | | | | | | | | Resize skipped icon | Annabel Dunstone Gray | 2016-11-10 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch '24038-fix-no-register-pane-if-ldap' into 'master' | Sean McGivern | 2016-11-10 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix no "Register" tab if ldap auth is enabled (#24038) | Luc Didry | 2016-11-10 | 1 | -0/+3 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch '24048-dropdown-issue-with-devider' into 'master' | Fatih Acet | 2016-11-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | resolves divider issue in group setting dropdown | Nur Rony | 2016-11-10 | 1 | -1/+1 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Make toggle pipeline btn into button element | Annabel Dunstone Gray | 2016-11-10 | 1 | -1/+1 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into 'mast... | Douwe Maan | 2016-11-10 | 2 | -7/+9 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove redundant rescue from repository keep_aroundfix/error-when-invalid-branch-for-new-pipeline-used | Grzegorz Bizon | 2016-11-09 | 1 | -5/+1 | |
| * | | | | | | | Remove redundant space from repository model code | Grzegorz Bizon | 2016-11-09 | 1 | -1/+1 | |
| * | | | | | | | Evade some exceptions when using invalid references | Grzegorz Bizon | 2016-11-07 | 1 | -1/+5 | |
| * | | | | | | | Improve code readability in pipelines controller | Grzegorz Bizon | 2016-11-07 | 1 | -1/+3 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge branch 'fix-cache-for-commit-status' into 'master' | Rémy Coutable | 2016-11-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Fix cache for commit status in commits list to respect branches | Lin Jen-Shin | 2016-11-10 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Use 'Forking in progress' title when appropriate | Philip Karpiak | 2016-11-09 | 1 | -1/+1 | |
|/ / / / / |