summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add 2FA docsrs-2fa-docsRobert Speicher2015-06-022-1/+67
| | | | [ci skip]
* Merge branch 'ignore-references' into 'master'Dmitriy Zaporozhets2015-06-027-60/+83
|\ | | | | | | | | | | | | | | Don't notify users mentioned in code blocks or blockquotes. cc @rspeicher See merge request !753
| * Fix spec.ignore-referencesDouwe Maan2015-06-021-6/+15
| |
| * Add changelog entry.Douwe Maan2015-06-021-0/+1
| |
| * Fix typo.Douwe Maan2015-06-021-1/+1
| |
| * Ignore references in blockquotes.Douwe Maan2015-06-023-5/+16
| |
| * Actually ignore references in code blocks etc.Douwe Maan2015-06-024-49/+51
| |
* | Merge branch 'rs-more-nofollow' into 'master'Douwe Maan2015-06-0226-110/+216
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Render Group and Project descriptions with our Markdown pipeline Continuation of !727, this ensures external links in these fields also get `rel="nofollow"` added. Bonus: Emoji now works in them! :sparkles: See merge request !735
| * | 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
| | | | | | | | | | | | And make it more generalized for all filter specs.
| * | 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
| | | | | | | | | | | | | | | When this option is `:description`, we use a more restrictive whitelist. This is used for Project and Group description fields.
| * | 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 file See merge request !689
| | * | 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
|\ \ \ | |/ / |/| | Specify shell while run me as git user
| * | Improve comments for shell_pathDrunkard Zhang2015-05-041-3/+2
| | |
| * | Specify shell while run me as git userDrunkard Zhang2015-02-042-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Some users disabled "git" user's shell after finished installation, this will lead to "This account is currently not available" and could not run /etc/init.d/gitlab, this dirty trick fix it. Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
* | | Improve hover colorDmitriy Zaporozhets2015-06-022-2/+1
| |/ |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'web-editor-rugged' into 'master'Dmitriy Zaporozhets2015-06-0215-282/+104
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create and edit files in web editor via rugged - [x] create file via rugged - [x] update file via rugged - [x] remove file via rugged - [ ] fix tests - [x] remove satellites code - [x] create activity event for new/edit file via rugged - [x] base64 support Part of https://dev.gitlab.org/gitlab/gitlabhq/issues/2300 See merge request !751
| * | Remove unnecessary satellite files and add CHANGELOG itemDmitriy Zaporozhets2015-06-024-81/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Make web editor work correctly after switch from satellitesDmitriy Zaporozhets2015-06-025-5/+7
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove files in web editor using ruggedDmitriy Zaporozhets2015-06-024-17/+40
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove now unnecessary satelittes logic for creating and editing file with ↵web-editor-ruggedDmitriy Zaporozhets2015-06-023-143/+0
| | | | | | | | | | | | | | | | | | web editor Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Create activity event and execute hooks on web editor commitDmitriy Zaporozhets2015-06-023-3/+11
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove file api tests which depend on old satellite logicDmitriy Zaporozhets2015-06-021-32/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Use rugged in web editor for base64 encodingDmitriy Zaporozhets2015-06-012-34/+28
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Allow base64 for edit blobsDmitriy Zaporozhets2015-06-011-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix adding new file to empty repoDmitriy Zaporozhets2015-06-013-4/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Create and edit files in web editor via ruggedDmitriy Zaporozhets2015-06-015-17/+62
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'rs-issue-1721' into 'master'Douwe Maan2015-06-022-3/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link_to_gfm with only a reference having the incorrect link Before: ```ruby link_to_gfm("#4", "/foo") # => "<a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" ``` After: ```ruby link_to_gfm("#4", "/foo") # => "<a href="/foo">#4</a>" link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" ``` Closes #192 Closes #1721 Closes [GitHub #7115](https://github.com/gitlabhq/gitlabhq/issues/7115) See merge request !739
| * | | Fix link_to_gfm with only a reference having the incorrect linkrs-issue-1721Robert Speicher2015-05-292-3/+22
| | | | | | | | | | | | | | | | Closes #1721
* | | | Merge branch 'feature/sso_integration' into 'master'Douwe Maan2015-06-025-0/+25
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to automatically sign-in with an Omniauth provider Split of !669 as requested This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication. See merge request !723
| * | | Add an option to automatically sign-in with an Omniauth provider without ↵Alex Lossent2015-05-295-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | showing the GitLab sign-in page This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication.
* | | | Merge branch 'refactor-header' into 'master'Dmitriy Zaporozhets2015-06-0115-200/+169
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor header css/html * Fixes UI issue with header on zoom * Replace duplicate numbers with variable * Better names for css classes * refactor header views Fixes #1640 See merge request !750
| * | | | improve navbar collapse for mobile viewsDmitriy Zaporozhets2015-06-013-13/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix header overflow for big titleDmitriy Zaporozhets2015-06-012-23/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor header viewsDmitriy Zaporozhets2015-06-017-27/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | More fixes to header cssDmitriy Zaporozhets2015-06-016-9/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor header css/htmlrefactor-headerDmitriy Zaporozhets2015-06-017-153/+153
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'linguist-comment' into 'master'Dmitriy Zaporozhets2015-06-011-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain gitlab forks in Gemfile Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2358 See merge request !749
| * | | | Add comments about gitlab forksDmitriy Zaporozhets2015-06-011-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Exmplain gitlab-linguist fork existenceDmitriy Zaporozhets2015-06-011-0/+4
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Better margin for header in accept MR widgetDmitriy Zaporozhets2015-06-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Show avatars in merge widget and fix mr download button overflowDmitriy Zaporozhets2015-06-012-11/+10
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | 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 API As noted in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/738#note_1307284 See merge request !745
| * | | | 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 out Split of !669 as requested This is especially useful with SAML ( !722 ) since the omniauth-saml gem does not support single log-out. This provides a way to log out the user from the SAML IdP after signing out from GitLab. See merge request !725
View Lorry Controller Status