summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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
* | | | | | | | Revert bad merge after releaseAlejandro Rodríguez2016-11-145-20/+0
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqAlejandro Rodríguez2016-11-145-0/+20
|\ \ \ \ \ \ \ \
* | | | | | | | | Update CHANGELOG.md for 8.14.0-rc2Alejandro Rodríguez2016-11-1422-84/+24
* | | | | | | | | Merge branch 'issue-13823' into 'master' Alfredo Sumaran2016-11-145-4/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Review comments Nov 11thJosep Llaneras2016-11-113-2/+5
| * | | | | | | | | Add new messagesJosep Llaneras2016-11-111-1/+5
| * | | | | | | | | Remove authorJosep Llaneras2016-11-114-28/+6
| * | | | | | | | | Issue #13823: random message when all Todos are DoneJosep Llaneras2016-11-117-4/+37
* | | | | | | | | | 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-142-2/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use shorthand property for padding fixPhilip Karpiak2016-11-141-2/+1
| * | | | | | | | | | Give search-input correct padding-right valuePhilip Karpiak2016-11-102-1/+5
* | | | | | | | | | | Merge branch 'grapify-declared-params' into 'master' Rémy Coutable2016-11-1412-36/+20
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Use declared_params helper in APIgrapify-declared-paramsRobert Schilling2016-11-1412-36/+20
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'issue-boards-signed-out-state' into 'master' 24457-cannot-delete-labelsFatih Acet2016-11-147-6/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed issue boards when not logged inissue-boards-signed-out-statePhil Hughes2016-11-147-6/+10
* | | | | | | | | | Merge branch 'always-show-download-button' into 'master' Annabel Dunstone Gray2016-11-142-1/+5
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Project download buttons always showPhilip Karpiak2016-11-102-1/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'grapify-to-h' into 'master' Rémy Coutable2016-11-143-7/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use #to_h to convert params to a hashgrapify-to-hRobert Schilling2016-11-143-7/+9
* | | | | | | | | | Merge branch 'master' into 'master' Rémy Coutable2016-11-141-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix typos and grammarseongahjo2016-11-141-2/+2
* | | | | | | | | | | Merge branch 'fix/improve-naming-convention-in-ci-config' into 'master' Kamil Trzciński2016-11-1456-221/+219
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix indentation in CI variables entry classGrzegorz Bizon2016-11-141-1/+1
| * | | | | | | | | | Change name of method for setting CI config entriesGrzegorz Bizon2016-11-145-28/+28
| * | | | | | | | | | Improve naming convention in ci configuration modulefix/improve-naming-convention-in-ci-configGrzegorz Bizon2016-11-1455-168/+166
* | | | | | | | | | | Merge branch 'grapify-subscription-api' into 'master' Rémy Coutable2016-11-141-23/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Grapify subscription APIRobert Schilling2016-11-141-23/+14
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | 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