summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use % notation for arrays in runner model constantsfix/reuse-runner-edit-form-in-admin-areaGrzegorz Bizon2016-05-111-2/+2
* Share form editable attributes mf runner via modelGrzegorz Bizon2016-05-103-2/+3
* Reuse runners edit form in admin and project areaGrzegorz Bizon2016-05-103-44/+29
* Merge branch 'wiki-fix' into 'master' Rémy Coutable2016-05-095-4/+7
|\
| * Use the proper GitLab URL for links in WikiArtem Sidorenko2016-05-095-4/+7
* | Merge branch 'rs-remove-wall_enabled' into 'master' Dmitriy Zaporozhets2016-05-096-7/+6
|\ \ | |/ |/|
| * Remove `wall_enabled` field from Projectrs-remove-wall_enabledRobert Speicher2016-05-086-7/+6
* | Merge branch 'improve-multiple-branch-push-performance' into 'master' Yorick Peterse2016-05-093-2/+8
|\ \
| * | Improve multiple branch push performance by memoizing permission checkingStan Hu2016-05-093-2/+8
* | | Merge branch 'trusted-proxies-ip-addr' into 'master' Rémy Coutable2016-05-092-1/+53
|\ \ \ | |/ / |/| |
| * | Add tests for setting trusted_proxiestrusted-proxies-ip-addrDJ Mountney2016-05-041-0/+51
| * | Pass trusted_proxies to action_dispatch as IPAddrs instead of stringsDJ Mountney2016-04-281-1/+2
* | | Merge branch 'escape-commit-titles' into 'master' Robert Speicher2016-05-083-1/+15
|\ \ \
| * | | Escape HTML in commit titles in system note messagesStan Hu2016-05-073-1/+15
* | | | Merge branch 'fix-build-notification-on-merge-page-change' into 'master' Stan Hu2016-05-084-10/+15
|\ \ \ \
| * | | | Fix build notification on merge request page change even if the build status ...Benedikt Huss2016-05-084-10/+15
| | |_|/ | |/| |
* | | | Merge branch 'docs/adapt-user-api' into 'master' Achilleas Pipinellis2016-05-081-22/+58
|\ \ \ \
| * | | | docs(api): adapted user API documentation to match with latest APIFabio Huser2016-05-061-22/+58
* | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-05-081-1/+1
|\ \ \ \ \
| * | | | | blost -> blogBen Bodenmiller2016-05-061-1/+1
* | | | | | Merge branch 'update-doc-ci-examples' into 'master' Achilleas Pipinellis2016-05-083-9/+9
|\ \ \ \ \ \
| * | | | | | Update CI example docs.Takuya Noguchi2016-05-073-9/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'update-docker-hub-link' into 'master' Achilleas Pipinellis2016-05-087-17/+17
|\ \ \ \ \ \
| * | | | | | Rename Docker with Docker Engine.Takuya Noguchi2016-05-072-4/+4
| * | | | | | Update Docker Hub links.Takuya Noguchi2016-05-076-13/+13
| |/ / / / /
* | | | | | Merge branch 'hiring' into 'master' Dmitriy Zaporozhets2016-05-081-0/+4
|\ \ \ \ \ \
| * | | | | | We're hiring.hiringSytse Sijbrandij2016-05-061-0/+4
* | | | | | | Merge branch 'fix-sanitize-svg' into 'master' Robert Speicher2016-05-077-1/+258
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Update SVG sanitizer to conform to SVG 1.1Stan Hu2016-05-067-1/+258
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'reduce-delete-delay' into 'master' Stan Hu2016-05-073-3/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Reduce delay in destroying a project from 1-minute to immediatelyStan Hu2016-05-073-3/+9
|/ / / / /
* | | | | Merge branch 'dz-improve-group-settings' into 'master' Dmitriy Zaporozhets2016-05-061-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make group settings button white instead of gray for better visibilitydz-improve-group-settingsDmitriy Zaporozhets2016-05-061-1/+1
|/ / / /
* | | | Merge branch 'nice-todos-bell' into 'master' Dmitriy Zaporozhets2016-05-063-1/+10
|\ \ \ \
| * | | | Add nice new Todo bellnice-todos-bellJacob Schatz2016-05-063-1/+10
* | | | | Merge branch 'dz-refactor-group-subnav' into 'master' Dmitriy Zaporozhets2016-05-062-40/+21
|\ \ \ \ \
| * | | | | Move group settings navigation to own partialdz-refactor-group-subnavDmitriy Zaporozhets2016-05-062-40/+21
| |/ / / /
* | | | | Merge branch '17343-a-tag-code' into 'master' Jacob Schatz2016-05-061-0/+5
|\ \ \ \ \
| * | | | | Align code within links in comments17343-a-tag-codeAnnabel Dunstone2016-05-061-0/+5
* | | | | | Merge branch 'annotate-models' into 'master' Robert Speicher2016-05-065-2/+6
|\ \ \ \ \ \
| * | | | | | Annotate modelsDmitriy Zaporozhets2016-05-065-2/+6
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'update-db-schema' into 'master' Robert Speicher2016-05-061-9/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update db/schema.rb after running db:migrate:resetDmitriy Zaporozhets2016-05-061-9/+9
|/ / / / /
* | | | | Merge branch 'group-navigation-redesign' into 'master' Dmitriy Zaporozhets2016-05-0626-75/+185
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove duplicate cover-control mobile stylesgroup-navigation-redesignAnnabel Dunstone2016-05-051-12/+0
| * | | | Fix group settings dropdown for group members and visitorsDmitriy Zaporozhets2016-05-051-15/+15
| * | | | Remove group rss icon since it depends on context and duplciates on other pagesDmitriy Zaporozhets2016-05-051-3/+0
| * | | | Remove mobile styles; horizontally scroll layout nav linksAnnabel Dunstone2016-05-051-19/+3
| * | | | Merge branch 'master' into group-navigation-redesignDmitriy Zaporozhets2016-05-0564-227/+752
| |\ \ \ \
| * | | | | Reduce height of nav to 50pxAnnabel Dunstone2016-05-043-5/+6