summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-help-page-links' into 'master' Rémy Coutable2016-11-141-2/+2
|\
| * fix error links in help pageFu Xu2016-11-121-2/+2
* | Merge branch 'sh-fix-sidekiq-throttling-init' into 'master' Robert Speicher2016-11-141-0/+10
|\ \
| * | Only turn on Sidekiq throttling if application settings existssh-fix-sidekiq-throttling-initStan Hu2016-11-121-0/+10
* | | Merge branch 'user_filter_auth' into 'master' Rémy Coutable2016-11-141-1/+1
|\ \ \
| * | | Centralize LDAP config/filter logicDrew Blessing2016-11-111-1/+1
* | | | Merge branch 'zj-remove-unneeded-checks' into 'master' Robert Speicher2016-11-141-6/+0
|\ \ \ \
| * | | | Remove unneeded nil checkszj-remove-unneeded-checksZ.J. van de Weg2016-11-121-6/+0
| |/ / /
* | | | Merge branch 'issue_20245' into 'master' Robert Speicher2016-11-141-1/+2
|\ \ \ \
| * | | | Fix project Visibility level selector not using default valuesissue_20245Felipe Artur2016-11-101-1/+2
* | | | | Merge branch '22307-pipeline-link-in-builds-view' into 'master' Kamil Trzciński2016-11-138-12/+37
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | remove unused class name22307-pipeline-link-in-builds-viewMike Greiling2016-11-102-2/+2
| * | | | only display link to pipeline in generic build index, not on pipeline showMike Greiling2016-11-105-20/+22
| * | | | update generic commit status to correspond with build status templateMike Greiling2016-11-102-2/+11
| * | | | add missing column header for pipeline builds viewMike Greiling2016-11-102-3/+4
| * | | | remove red color on API pipeline trigger designationMike Greiling2016-11-101-4/+0
| * | | | add pipeline column within builds indexMike Greiling2016-11-102-0/+10
| * | | | add link to build's pipeline within build page headerMike Greiling2016-11-102-0/+7
* | | | | Merge branch '24202-header-ui-improvements' into 'master' Fatih Acet2016-11-122-0/+12
|\ \ \ \ \
| * | | | | Remove hover state on location badge.Devesh Khandelwal2016-11-121-6/+0
| * | | | | Darken more icons on hover and highlight search form also.Devesh Khandelwal2016-11-112-0/+14
| * | | | | Darken project selection dropdown caret on hover.Devesh Khandelwal2016-11-111-0/+4
| |/ / / /
* | | | | Does not raise error when Note not found when processing NewNoteWorkerOswaldo Ferreira2016-11-113-7/+13
| |_|/ / |/| | |
* | | | Merge branch '24386-8-14-rc1-requires-quite-amount-of-downtime' into 'master' Stan Hu2016-11-111-0/+4
|\ \ \ \
| * | | | Update 8.14-rc1 migrations to minimize downtime and deploy timeAlejandro Rodríguez2016-11-111-0/+4
* | | | | Merge branch '24397-load-labels-on-mr-tabs' into 'master' Sean McGivern2016-11-111-0/+1
|\ \ \ \ \
| * | | | | Ensure labels are loaded on "show" methods of MRAlex Sanford2016-11-111-0/+1
| |/ / / /
* | | | | 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
|\ \ \ \ \ \ \ \