summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-recursiveTree' into 'master' Douwe Maan2016-11-152-4/+22
|\
| * Issue #4270: Recursive option for files through APIRebeca Méndez2016-11-122-4/+22
* | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-155-1/+52
|\ \
| * | Add button to delete all merged branchesToon Claes2016-11-095-1/+52
* | | Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' Douwe Maan2016-11-151-1/+1
|\ \ \
| * | | Fix Error 500 when creating a merge request that contains an image that was d...stanhu/gitlab-ce-fix-error-500-with-mr-imagesStan Hu2016-11-141-1/+1
* | | | Merge branch '24392-lfs-helper-refactor' into 'master' Douwe Maan2016-11-152-4/+4
|\ \ \ \
| * | | | Move the `objects` method to `LfsHelper` so that it is also available to `Lfs...24392-lfs-helper-refactorPatricio Cano2016-11-102-4/+4
* | | | | Merge branch 'fix-migration-changes' into 'master' Stan Hu2016-11-151-4/+1
|\ \ \ \ \
| * | | | | Use `default_value_for` to handle null values in only_allow_merge_if_all_disc...fix-migration-changesAlejandro Rodríguez2016-11-141-4/+1
* | | | | | Merge branch 'issue-13823' into 'master' Alfredo Sumaran2016-11-141-1/+1
|\ \ \ \ \ \
| * | | | | | Review comments Nov 11thJosep Llaneras2016-11-111-1/+1
| * | | | | | Remove authorJosep Llaneras2016-11-113-17/+2
| * | | | | | Issue #13823: random message when all Todos are DoneJosep Llaneras2016-11-113-1/+16
* | | | | | | Merge branch '21778-pinned-nav-header' into 'master' Annabel Dunstone Gray2016-11-143-2/+26
|\ \ \ \ \ \ \
| * | | | | | | 21778 Correct css styles for pinned navigation21778-pinned-nav-headertauriedavis2016-11-113-2/+26
| |/ / / / / /
* | | | | | | Merge branch 'fix-search-input-padding' into 'master' Annabel Dunstone Gray2016-11-141-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Use shorthand property for padding fixPhilip Karpiak2016-11-141-2/+1
| * | | | | | | Give search-input correct padding-right valuePhilip Karpiak2016-11-101-1/+1
* | | | | | | | Merge branch 'issue-boards-signed-out-state' into 'master' 24457-cannot-delete-labelsFatih Acet2016-11-146-6/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fixed issue boards when not logged inissue-boards-signed-out-statePhil Hughes2016-11-146-6/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'always-show-download-button' into 'master' Annabel Dunstone Gray2016-11-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Project download buttons always showPhilip Karpiak2016-11-101-1/+1
| |/ / / / /
* | | | | | 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
| |/ / / / / /