summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updates changelogfl-18932-revoke-buttonFilipa Lacerda2016-09-261-1/+1
* Removes class 'btn-link' of Revoke buttonFilipa Lacerda2016-09-262-1/+2
* Merge branch 'robots-snippets' into 'master' Rémy Coutable2016-09-262-1/+2
|\
| * update robots.txt disallowMatt Harrison2016-09-232-1/+2
* | Merge branch 'patch-2' into 'master' Rémy Coutable2016-09-261-1/+1
|\ \
| * | Fixed a broken documentation link to the wiki-specific-markdown.Brandon Patton2016-08-301-1/+1
* | | Merge branch 'api-alphabetical' into 'master' Rémy Coutable2016-09-261-1/+2
|\ \ \
| * | | Keep API mounts in alphabetical orderAchilleas Pipinellis2016-09-251-1/+2
* | | | Merge branch 'fix/import-services' into 'master' Rémy Coutable2016-09-267-0/+35
|\ \ \ \
| * | | | fix changelogJames Lopez2016-09-261-1/+1
| * | | | added more specsJames Lopez2016-09-262-1/+17
| * | | | Fixes issue with rails reserved keyword type exporting/importing services. Al...James Lopez2016-09-266-0/+19
* | | | | Merge branch 'ldap' into 'master' Rémy Coutable2016-09-261-1/+1
|\ \ \ \ \
| * | | | | fix LDAP omniauth regression (Closes: #22357)Dmitry Smirnov2016-09-211-1/+1
* | | | | | Merge branch 'fix_trivial_doc_typo' into 'master' Rémy Coutable2016-09-261-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix trivial typo in docsArnold Bechtoldt2016-08-171-1/+1
* | | | | | Merge branch 'rs-remove-gitlab_meta' into 'master' Dmitriy Zaporozhets2016-09-262-7/+1
|\ \ \ \ \ \
| * | | | | | Remove gitlab_meta gemrs-remove-gitlab_metaRobert Speicher2016-09-252-7/+1
* | | | | | | Merge branch 'cannonical-typo' into 'master' Robert Speicher2016-09-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in README cannonical-typoSean McGivern2016-09-251-1/+1
|/ / / / / / /
* | | | | | | Merge branch '22229-use-base-sha-when-downloading-merge-requests' into 'master' Robert Speicher2016-09-252-9/+43
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use base SHA for patches and diffsNick Thomas2016-09-222-9/+43
* | | | | | | Merge branch 'patch-5' into 'master' Achilleas Pipinellis2016-09-251-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix typo in README.mdJohan Brandhorst2016-09-141-1/+1
* | | | | | | Merge branch 'update-changelog' into 'master' Rubén Dávila Santos2016-09-241-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix CHANGELOG.Ruben Davila2016-09-241-1/+4
|/ / / / / / /
* | | | | | | Merge branch 'gitlab-ce-milestone-tab-badges' into 'master' Fatih Acet2016-09-247-11/+98
|\ \ \ \ \ \ \
| * | | | | | | Ensure milestone counts work with no datagitlab-ce-milestone-tab-badgesAlfredo Sumaran2016-09-072-23/+22
| * | | | | | | Fix failing specs and improve htmlAlfredo Sumaran2016-09-075-15/+26
| * | | | | | | Added a small helper to reduce logic in the viewDan Rowden2016-09-072-3/+14
| * | | | | | | Take out of /dashboard/milestones as the helper query clashes with kaminari a...Dan Rowden2016-09-071-4/+8
| * | | | | | | Updated milestone count helper plus testsDan Rowden2016-09-074-5/+43
| * | | | | | | Use newer hash styleDan Rowden2016-09-072-6/+6
| * | | | | | | Improved milestone counts with a single queryDan Rowden2016-09-072-14/+15
| * | | | | | | ChangelingDan Rowden2016-09-071-0/+3
| * | | | | | | Show badges in Milestone tabs and padding in Milestone list (both to match Is...Dan Rowden2016-09-073-6/+26
* | | | | | | | Merge branch 'flash-container-z-index' into 'master' Fatih Acet2016-09-241-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed z-index from flash containerflash-container-z-indexPhil Hughes2016-09-081-2/+0
* | | | | | | | | Merge branch '22459-tooltips-for-mini-pipeline-graph-in-pipeline-list-use-the...Fatih Acet2016-09-241-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Changed links that wrap the icon svg to `display: block` so there isn't any i...22459-tooltips-for-mini-pipeline-graph-in-pipeline-list-use-the-svg-instead-of-containerLuke Bennett2016-09-231-0/+4
* | | | | | | | | | Merge branch 'fix/memory-leak-sanitization-filter' into 'master' Yorick Peterse2016-09-232-32/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix the leak mentioned in 504a3b5 by another wayAhmad Sherif2016-09-232-29/+32
| * | | | | | | | | | Revert "Fix a memory leak caused by Banzai::Filter::SanitizationFilter"Ahmad Sherif2016-09-231-3/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'zj-link-broadcast-api-docs' into 'master' Robert Speicher2016-09-231-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Add link to broadcast messages docsZ.J. van de Weg2016-09-231-0/+1
* | | | | | | | | | Merge branch 'fix/database-seeds' into 'master' Rémy Coutable2016-09-234-18/+28
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove use of `USE_DB` environment variable in codefix/database-seedsGrzegorz Bizon2016-09-231-3/+1
| * | | | | | | | | Limit test environment size to one project in CIGrzegorz Bizon2016-09-232-10/+5
| * | | | | | | | | Update `CurrentSettings` class that uses ENVGrzegorz Bizon2016-09-221-1/+1
| * | | | | | | | | Improve CI job that tests database seedsGrzegorz Bizon2016-09-221-4/+4