summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessaryAdam Niedzielski2016-11-1611-54/+49
* Merge branch 'fix-help-page-links' into 'master' Rémy Coutable2016-11-143-2/+44
|\
| * fix error links in help pageFu Xu2016-11-123-2/+44
* | Merge branch 'sh-fix-sidekiq-throttling-init' into 'master' Robert Speicher2016-11-142-1/+11
|\ \
| * | Only turn on Sidekiq throttling if application settings existssh-fix-sidekiq-throttling-initStan Hu2016-11-122-1/+11
* | | Link to correct version of SanitizationFilter API docs for whitelistRobert Speicher2016-11-141-1/+1
* | | Merge branch 'user_filter_auth' into 'master' Rémy Coutable2016-11-147-31/+150
|\ \ \
| * | | Centralize LDAP config/filter logicDrew Blessing2016-11-117-31/+150
* | | | 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-143-1/+25
|\ \ \ \
| * | | | Fix project Visibility level selector not using default valuesissue_20245Felipe Artur2016-11-103-1/+25
* | | | | Merge branch 'repository-name-emojis' into 'master' Rémy Coutable2016-11-145-13/+30
|\ \ \ \ \
| * | | | | Added ability to put emojis into repository nameVincent Composieux2016-11-125-13/+30
* | | | | | Merge branch 'patch-12' into 'master' Sean McGivern2016-11-141-1/+1
|\ \ \ \ \ \
| * | | | | | use single quote for consistencyBen Bodenmiller2016-11-121-1/+1
* | | | | | | Merge branch '22307-pipeline-link-in-builds-view' into 'master' Kamil Trzciński2016-11-1311-12/+97
|\ \ \ \ \ \ \
| * | | | | | | remove unused class name22307-pipeline-link-in-builds-viewMike Greiling2016-11-102-2/+2
| * | | | | | | add tests for build row templatesMike Greiling2016-11-102-0/+56
| * | | | | | | 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 CHANGELOG entry for !7082Mike Greiling2016-11-101-0/+4
| * | | | | | | 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 'zj-update-ci' into 'master' Kamil Trzciński2016-11-131-5/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Also test on dev.gitlab [ci skip]zj-update-ciZ.J. van de Weg2016-11-121-1/+9
| * | | | | | | Only run builds on master of CE or EEZ.J. van de Weg2016-11-121-4/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ux-guide-index' into 'master' Achilleas Pipinellis2016-11-121-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix link to index.md in development README.mdux-guide-indexAchilleas Pipinellis2016-11-121-1/+1
|/ / / / / /
* | | | | | 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
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'new-note-worker-record-not-found-fix' into 'master' Sean McGivern2016-11-126-11/+99
|\ \ \ \ \ \
| * | | | | | Does not raise error when Note not found when processing NewNoteWorkerOswaldo Ferreira2016-11-116-11/+99
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'patch-8' into 'master' Sean McGivern2016-11-121-1/+1
|\ \ \ \ \ \
| * | | | | | fix Super User spacingBen Bodenmiller2016-11-121-1/+1
| |/ / / / /
* | | | | | Merge branch 'patch-11' into 'master' Sean McGivern2016-11-121-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | update redis server detailsBen Bodenmiller2016-11-121-5/+5
|/ / / / /
* | | | | Merge branch '24386-8-14-rc1-requires-quite-amount-of-downtime' into 'master' Stan Hu2016-11-115-5/+14
|\ \ \ \ \
| * | | | | Update 8.14-rc1 migrations to minimize downtime and deploy timeAlejandro Rodríguez2016-11-115-5/+14
* | | | | | Merge branch '24397-load-labels-on-mr-tabs' into 'master' Sean McGivern2016-11-113-0/+30
|\ \ \ \ \ \
| * | | | | | Ensure labels are loaded on "show" methods of MRAlex Sanford2016-11-113-0/+30
* | | | | | | Merge branch 'sidekiq-job-throttling' into 'master' Douwe Maan2016-11-1116-1/+178
|\ \ \ \ \ \ \
| * | | | | | | Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttlingPatricio Cano2016-11-116-23/+20
| * | | | | | | Refactored initializer code to its own class and added testsPatricio Cano2016-11-103-7/+56
| * | | | | | | Added documentation and CHANGELOG item.Patricio Cano2016-11-104-0/+37
| * | | | | | | Allow the Sidekiq queues to throttle and the factor by which to throttle them...Patricio Cano2016-11-108-13/+41