summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Further limit the limited whitelist for project/group descriptionsrs-more-nofollowRobert Speicher2015-06-022-2/+18
* Rename ReferenceFilterSpecHelper to FilterSpecHelperRobert Speicher2015-06-0215-61/+56
* Add feature specs for Project and Group description renderingRobert Speicher2015-06-023-12/+82
* Add a `pipeline` context option for SanitizationFilterRobert Speicher2015-06-025-23/+56
* Remove now-unused `escaped_autolink` helper and rails_autolink gemRobert Speicher2015-06-023-10/+0
* Render Group and Project descriptions with our Markdown pipelineRobert Speicher2015-06-023-6/+8
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-023-0/+30
|\
| * Merge branch 'ci_yml_file' into 'master'Dmitriy Zaporozhets2015-06-023-0/+30
| |\
| | * GitLab CI service sends gitlab-ci.yml fileci_yml_fileValery Sizov2015-06-023-0/+30
| |/
* | Merge pull request #8730 from drunkard/masterMarin Jankovski2015-06-022-1/+7
|\ \ | |/ |/|
| * Improve comments for shell_pathDrunkard Zhang2015-05-041-3/+2
| * Specify shell while run me as git userDrunkard Zhang2015-02-042-1/+8
* | Improve hover colorDmitriy Zaporozhets2015-06-022-2/+1
* | Merge branch 'web-editor-rugged' into 'master'Dmitriy Zaporozhets2015-06-0215-282/+104
|\ \
| * | Remove unnecessary satellite files and add CHANGELOG itemDmitriy Zaporozhets2015-06-024-81/+3
| * | Make web editor work correctly after switch from satellitesDmitriy Zaporozhets2015-06-025-5/+7
| * | Remove files in web editor using ruggedDmitriy Zaporozhets2015-06-024-17/+40
| * | Remove now unnecessary satelittes logic for creating and editing file with we...web-editor-ruggedDmitriy Zaporozhets2015-06-023-143/+0
| * | Create activity event and execute hooks on web editor commitDmitriy Zaporozhets2015-06-023-3/+11
| * | Remove file api tests which depend on old satellite logicDmitriy Zaporozhets2015-06-021-32/+3
| * | Use rugged in web editor for base64 encodingDmitriy Zaporozhets2015-06-012-34/+28
| * | Allow base64 for edit blobsDmitriy Zaporozhets2015-06-011-2/+2
| * | Fix adding new file to empty repoDmitriy Zaporozhets2015-06-013-4/+4
| * | Create and edit files in web editor via ruggedDmitriy Zaporozhets2015-06-015-17/+62
* | | Merge branch 'rs-issue-1721' into 'master'Douwe Maan2015-06-022-3/+22
|\ \ \
| * | | Fix link_to_gfm with only a reference having the incorrect linkrs-issue-1721Robert Speicher2015-05-292-3/+22
* | | | Merge branch 'feature/sso_integration' into 'master'Douwe Maan2015-06-025-0/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | Add an option to automatically sign-in with an Omniauth provider without show...Alex Lossent2015-05-295-0/+25
* | | | Merge branch 'refactor-header' into 'master'Dmitriy Zaporozhets2015-06-0115-200/+169
|\ \ \ \
| * | | | improve navbar collapse for mobile viewsDmitriy Zaporozhets2015-06-013-13/+10
| * | | | Fix header overflow for big titleDmitriy Zaporozhets2015-06-012-23/+6
| * | | | Refactor header viewsDmitriy Zaporozhets2015-06-017-27/+18
| * | | | More fixes to header cssDmitriy Zaporozhets2015-06-016-9/+7
| * | | | Refactor header css/htmlrefactor-headerDmitriy Zaporozhets2015-06-017-153/+153
|/ / / /
* | | | Merge branch 'linguist-comment' into 'master'Dmitriy Zaporozhets2015-06-011-0/+8
|\ \ \ \
| * | | | Add comments about gitlab forksDmitriy Zaporozhets2015-06-011-1/+5
| * | | | Exmplain gitlab-linguist fork existenceDmitriy Zaporozhets2015-06-011-0/+4
|/ / / /
* | | | Better margin for header in accept MR widgetDmitriy Zaporozhets2015-06-011-1/+1
* | | | Show avatars in merge widget and fix mr download button overflowDmitriy Zaporozhets2015-06-012-11/+10
* | | | Merge branch 'disable-mr-source-branch-change' into 'master'Dmitriy Zaporozhets2015-06-015-8/+12
|\ \ \ \
| * | | | Disable changing of the source branch in merge request update APIStan Hu2015-05-295-8/+12
* | | | | Merge branch 'feature/sign_out_page' into 'master'Dmitriy Zaporozhets2015-06-017-2/+20
|\ \ \ \ \
| * | | | | Allow to configure a URL to show after sign outAlex Lossent2015-05-297-2/+20
| | |/ / / | |/| | |
* | | | | Improve UI for accept MR widgetDmitriy Zaporozhets2015-06-011-13/+7
* | | | | Merge branch 'master' into 'master'Robert Schilling2015-05-311-1/+1
|\ \ \ \ \
| * | | | | small typoTerrence Benade2015-05-311-1/+1
|/ / / / /
* | | | | Merge branch 'fix/saml_changelog' into 'master'Robert Schilling2015-05-291-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix misplaced changelog entry for SAML supportAlex Lossent2015-05-291-1/+1
| |/ / /
* | | | Improve UI of project sidebarDmitriy Zaporozhets2015-05-293-9/+14
|/ / /
* | | Merge branch 'leave-project' into 'master'Dmitriy Zaporozhets2015-05-296-4/+35
|\ \ \
View Lorry Controller Status