summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'sidekiq-job-throttling' into 'master' Douwe Maan2016-11-114-1/+44
|\ \ \ \ \ \ \
| * | | | | | | Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttlingPatricio Cano2016-11-112-3/+3
| * | | | | | | Allow the Sidekiq queues to throttle and the factor by which to throttle them...Patricio Cano2016-11-104-1/+29
| * | | | | | | Allow certain Sidekiq jobs to be throttledPatricio Cano2016-11-103-0/+15
* | | | | | | | Merge branch 'vue2' into 'master' Fatih Acet2016-11-1137-347/+350
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fixed tests for issue boards & diff note resolvingvue2Phil Hughes2016-11-101-0/+2
| * | | | | | | Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-104-27/+17
| * | | | | | | Changed how lists get sortedPhil Hughes2016-11-103-2/+6
| * | | | | | | Issue board spec fixesPhil Hughes2016-11-102-1/+3
| * | | | | | | Fixed jump to discussion button not showingPhil Hughes2016-11-101-1/+5
| * | | | | | | Changed how resolving notes is renderedPhil Hughes2016-11-104-35/+39
| * | | | | | | Remove unnecesarry require.Fatih Acet2016-11-101-1/+0
| * | | | | | | Fixed up resolve discussionsPhil Hughes2016-11-108-27/+43
| * | | | | | | Refactor of issue boards to work with Vue2Phil Hughes2016-11-1016-234/+225
| * | | | | | | VueJSMigration: Remove parallel-conflict-line component.Fatih Acet2016-11-103-20/+11
| * | | | | | | Vue migration fix syntax highlighting.Fatih Acet2016-11-101-1/+1
| * | | | | | | VueJS migration, replace {{{ with v-htmlFatih Acet2016-11-102-5/+3
| * | | | | | | Migrate Vue v1 to v2.Fatih Acet2016-11-109-21/+23
* | | | | | | | Merge branch '19205-group-header-redesign' into 'master' Annabel Dunstone Gray2016-11-117-53/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | 19205 Redesign group page header to match new navigation19205-group-header-redesigntauriedavis2016-11-097-53/+41
* | | | | | | | | Merge branch '21764-build-page-title' into 'master' Fatih Acet2016-11-114-8/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed soon-to-be un-needed project title additions from builds and environm...21764-build-page-titleLuke Bennett2016-11-094-8/+3
* | | | | | | | | | Merge branch '23520-mr-sticky-tabs-overlap-discussion-from-anchor' into 'mast...Fatih Acet2016-11-112-2/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Account for merge request fixed affix bar23520-mr-sticky-tabs-overlap-discussion-from-anchorLuke Bennett2016-11-102-2/+19
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master' Sean McGivern2016-11-112-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-102-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'milestone-project-require' into 'master' Sean McGivern2016-11-112-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Require projects before creating milestonegfyoung2016-11-102-2/+2
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'use-config-param' into 'master' Sean McGivern2016-11-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Use config param in `Repository#update_ref!`teru2016-11-101-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '24369-remove-additional-padding' into 'master' Annabel Dunstone Gray2016-11-101-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove additional padding on right-aligned items in MR widget.Didem Acet2016-11-101-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch '24279-issue-merge-request-sidebar-todo-button-style-improvement...Annabel Dunstone Gray2016-11-101-14/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | removed gray button styling from todo buttons in sidebars24279-issue-merge-request-sidebar-todo-button-style-improvementDimitrie Hoekstra2016-11-101-14/+0
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '24353-skipped-icon' into 'master' Fatih Acet2016-11-102-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix alignment of status icons in commit message list24353-skipped-iconAnnabel Dunstone Gray2016-11-101-0/+2
| * | | | | | | | Resize skipped iconAnnabel Dunstone Gray2016-11-101-1/+1
* | | | | | | | | Merge branch '24038-fix-no-register-pane-if-ldap' into 'master' Sean McGivern2016-11-101-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix no "Register" tab if ldap auth is enabled (#24038)Luc Didry2016-11-101-0/+3
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch '24048-dropdown-issue-with-devider' into 'master' Fatih Acet2016-11-101-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | resolves divider issue in group setting dropdownNur Rony2016-11-101-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Make toggle pipeline btn into button elementAnnabel Dunstone Gray2016-11-101-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into 'mast...Douwe Maan2016-11-102-7/+9
|\ \ \ \ \ \ \
| * | | | | | | Remove redundant rescue from repository keep_aroundfix/error-when-invalid-branch-for-new-pipeline-usedGrzegorz Bizon2016-11-091-5/+1
| * | | | | | | Remove redundant space from repository model codeGrzegorz Bizon2016-11-091-1/+1
| * | | | | | | Evade some exceptions when using invalid referencesGrzegorz Bizon2016-11-071-1/+5
| * | | | | | | Improve code readability in pipelines controllerGrzegorz Bizon2016-11-071-1/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix-cache-for-commit-status' into 'master' Rémy Coutable2016-11-101-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix cache for commit status in commits list to respect branchesLin Jen-Shin2016-11-101-1/+1
| | |/ / / / | |/| | | |
* | | | | | Use 'Forking in progress' title when appropriatePhilip Karpiak2016-11-091-1/+1
|/ / / / /