summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Remove class and id attributes from SanitizationFilter whitelistrs-disallow-id-classRobert Speicher2015-05-081-2/+17
* Merge pull request #9214 from Bugagazavr/hook-eventsValeriy Sizov2015-05-081-1/+1
|\
| * Added X-GitLab-Event header for web hooksbugagazavr2015-05-081-1/+1
* | Merge branch 'rs-task_list' into 'master'Dmitriy Zaporozhets2015-05-083-30/+20
|\ \
| * | Update Markdown help docs for latest changesRobert Speicher2015-05-061-1/+1
| * | Remove 'jasmine' gemRobert Speicher2015-05-061-0/+12
| * | Remove all references to `parse_tasks`Robert Speicher2015-05-061-28/+3
| * | Add TaskList::Filter to pipelineRobert Speicher2015-05-061-4/+7
| |/
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-081-1/+1
|\ \
| * | Revert "Allow to configure smtp and sendmail in gitlab.yml"Dmitriy Zaporozhets2015-05-061-1/+1
| |/
* | Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env varJacob Vosmaer2015-05-071-5/+6
|/
* Allow to configure smtp and sendmail in gitlab.ymlJakub Jirutka2015-05-061-1/+1
* Update authentication.rbquodos2015-05-041-1/+1
* Add current_sign_in_at to api UserSven Selberg2015-05-041-1/+1
* Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into jubianch...Dmitriy Zaporozhets2015-05-033-5/+18
|\
| * Query issues, merge requests and milestones with their IID through APIjubianchi2015-05-023-5/+18
* | Merge pull request #9066 from jirutka/fix-6417Dmitriy Zaporozhets2015-05-031-2/+2
|\ \
| * | Fix #6417: users with group permission should be able to create groups via APIRobert Schilling2015-03-311-2/+2
* | | Merge pull request #8756 from zaburt/force_utf8_on_oauth_propertiesDmitriy Zaporozhets2015-05-032-7/+16
|\ \ \
| * | | add common method to force utf8 and force oauth properties to be utf8Onur Küçük2015-05-032-7/+16
| | |/ | |/|
* | | Remove title_for_issue helperRobert Speicher2015-04-301-5/+1
* | | Remove special handling for the `'` problemRobert Speicher2015-04-302-13/+1
* | | Add Project#get_issueRobert Speicher2015-04-301-7/+6
* | | Rename SCHEME_PATTERN to LINK_PATTERNRobert Speicher2015-04-301-5/+5
* | | Autolink short URLsRobert Speicher2015-04-301-1/+4
* | | Update Autolink SCHEME_PATTERNRobert Speicher2015-04-301-1/+3
* | | Doc typoRobert Speicher2015-04-301-1/+1
* | | Escape normal text in our Redcarpet rendererRobert Speicher2015-04-301-1/+3
* | | Update the Gitlab::Markdown docsRobert Speicher2015-04-301-25/+1
* | | Add Gitlab::Markdown::SanitizationFilterRobert Speicher2015-04-302-31/+41
* | | Add Gitlab::Markdown::AutolinkFilterRobert Speicher2015-04-303-14/+103
* | | Add Gitlab::Markdown::TableOfContentsFilterRobert Speicher2015-04-303-10/+67
* | | Merge branch 'show-invalid-projects-google-code-import' into 'master'Douwe Maan2015-04-301-0/+4
|\ \ \ | |/ / |/| |
| * | Show incompatible projects in Google Code import statusStan Hu2015-04-301-0/+4
* | | Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-301-2/+2
|/ /
* | Merge pull request #8677 from jubianchi/api-500-jsonJeroen van Baarsen2015-04-281-1/+1
|\ \
| * | Send 500 errors as JSON in the APIjubianchi2015-04-271-1/+1
* | | Add a rake task to automatically restart foreman when changes occurjubianchi2015-04-271-0/+5
|/ /
* | Merge pull request #8754 from jirutka/fix-project_name_regexJeroen van Baarsen2015-04-271-4/+4
|\ \
| * | Fix (project_)name_regex to accept non-ASCII letters and dashJakub Jirutka2015-04-271-4/+4
* | | Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-271-1/+1
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-2711-197/+148
|\ \
| * \ Merge branch 'fix-gitorious-importer' into 'master'Dmitriy Zaporozhets2015-04-271-1/+1
| |\ \
| | * | Get Gitorious importer to work again.fix-gitorious-importerDouwe Maan2015-04-241-1/+1
| * | | Merge branch 'rs-minor-styles' into 'master'Dmitriy Zaporozhets2015-04-271-14/+25
| |\ \ \
| | * | | Fix Profile > Design live-updatingRobert Speicher2015-04-251-14/+25
| | |/ /
| * | | Convert UserReferenceFilter#link_to_group to use a guard clauseRobert Speicher2015-04-251-7/+5
| * | | Refactor `UserReferenceFilter#user_link_filter`Robert Speicher2015-04-251-35/+43
| * | | Fix docs for `push_result`Robert Speicher2015-04-251-2/+2
| * | | Fix NotificationService specRobert Speicher2015-04-252-5/+5