summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove class and id attributes from SanitizationFilter whitelistrs-disallow-id-classRobert Speicher2015-05-085-36/+59
* Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-05-0815-31/+132
|\
| * Merge pull request #9214 from Bugagazavr/hook-eventsValeriy Sizov2015-05-0815-31/+132
| |\
| | * Added X-GitLab-Event header for web hooksbugagazavr2015-05-0815-31/+132
* | | Merge branch 'How_to_Reset_your_root_password' into 'master'Job van der Voort2015-05-082-0/+41
|\ \ \ | |/ / |/| |
| * | make it more obvious what happens in the codeJob van der Voort2015-05-081-4/+4
| * | remove redundant colonJob van der Voort2015-05-081-1/+1
| * | Deleted > and commented "or" outKaren Carias2015-05-071-5/+9
| * | Added link to root password doc correctlyKaren Carias2015-05-071-0/+1
| * | New file to add to security documentation, "How to reset your root password"Karen Carias2015-04-281-0/+36
* | | Merge branch 'quote_string' into 'master'Valery Sizov2015-05-081-1/+2
|\ \ \
| * | | Adding quote_string to migrationquote_stringValery Sizov2015-05-081-1/+2
* | | | Merge branch 'fix_link_in_doc' into 'master'Valery Sizov2015-05-081-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix link to the CI documentationValery Sizov2015-05-081-1/+1
|/ / /
* | | Merge branch 'backup_doc' into 'master'Sytse Sijbrandij2015-05-081-7/+67
|\ \ \
| * | | improved backup docValery Sizov2015-05-081-7/+65
| * | | Link to CI backup documentationbackup_docValery Sizov2015-05-071-0/+2
* | | | Merge branch 'rs-task_list' into 'master'Dmitriy Zaporozhets2015-05-0841-507/+543
|\ \ \ \
| * | | | Add CHANGELOG entry for latest task listsrs-task_listRobert Speicher2015-05-061-1/+1
| * | | | Update Markdown help docs for latest changesRobert Speicher2015-05-062-45/+50
| * | | | Fix header link anchorsRobert Speicher2015-05-061-1/+3
| * | | | Change wording for task list summariesRobert Speicher2015-05-063-6/+6
| * | | | Remove 'jasmine' gemRobert Speicher2015-05-063-7/+12
| * | | | More JS dependency requirementsRobert Speicher2015-05-064-1/+7
| * | | | Remove unneeded jasmine setupRobert Speicher2015-05-062-5/+0
| * | | | Disable Rack::MiniProfiler for Jasmine's specs routeRobert Speicher2015-05-061-0/+1
| * | | | Task List feature and JS specsRobert Speicher2015-05-064-0/+253
| * | | | Make issue JS require its dependenciesRobert Speicher2015-05-061-0/+2
| * | | | Make notes JS require its dependenciesRobert Speicher2015-05-061-3/+11
| * | | | Update jasmine-fixtureRobert Speicher2015-05-061-3/+3
| * | | | Remove feature tests for old task listsRobert Speicher2015-05-067-160/+4
| * | | | Add TaskList to Markdown feature specRobert Speicher2015-05-062-3/+22
| * | | | Change padding for task lists in notesRobert Speicher2015-05-061-0/+10
| * | | | Don't add js-task-list-container to things the user can't editRobert Speicher2015-05-064-4/+8
| * | | | Single quotes/icon helper in viewsRobert Speicher2015-05-065-39/+39
| * | | | Remove all references to `parse_tasks`Robert Speicher2015-05-064-139/+5
| * | | | Update Taskable to use TaskListRobert Speicher2015-05-062-50/+25
| * | | | Update task list behavior for Merge RequestsRobert Speicher2015-05-063-6/+27
| * | | | Update task list behavior for NotesRobert Speicher2015-05-063-4/+20
| * | | | Update task list behavior for IssuesRobert Speicher2015-05-063-6/+27
| * | | | Add task_list JSRobert Speicher2015-05-061-0/+1
| * | | | Add TaskList::Filter to pipelineRobert Speicher2015-05-061-4/+7
| * | | | Remove taskable.jsRobert Speicher2015-05-061-21/+0
| * | | | Add task_list gemRobert Speicher2015-05-062-12/+12
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-083-2/+35
|\ \ \ \ \
| * \ \ \ \ Merge branch 'tag_dup' into 'master'Valery Sizov2015-05-081-0/+16
| |\ \ \ \ \
| | * | | | | remove tag duplicatestag_dupValery Sizov2015-05-071-0/+16
| * | | | | | Merge branch 'fix-mysql-migration-with-tags' into 'master'Valery Sizov2015-05-081-0/+10
| |\ \ \ \ \ \
| | * | | | | | Change the MySQL collation type to utf8_bin to ensure case-sensitive tags are...Stan Hu2015-05-071-0/+10
| * | | | | | | Merge branch 'conditional-delete-taggings-indices' into 'master'Valery Sizov2015-05-081-2/+9
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
View Lorry Controller Status