summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix commits feed button.create-merge-requestDouwe Maan2015-05-101-4/+4
|
* Improve create_mr_button? performance.Douwe Maan2015-05-091-5/+4
|
* Fix spec.Douwe Maan2015-05-091-1/+1
|
* Add Merge Request button to branches page.Douwe Maan2015-05-092-5/+8
|
* Add Create Merge Request buttons to commits page and push event.Douwe Maan2015-05-095-21/+41
|
* Link Commits tab to current branch from Compare page.Douwe Maan2015-05-092-2/+3
|
* Merge branch 'rs-disallow-id-class' into 'master'Dmitriy Zaporozhets2015-05-095-36/+59
|\ | | | | | | | | | | | | | | Remove class and id attributes from SanitizationFilter whitelist Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2302 See merge request !631
| * Remove class and id attributes from SanitizationFilter whitelistrs-disallow-id-classRobert Speicher2015-05-085-36/+59
| |
* | Merge pull request #9244 from dreis2211/firefox_issuable_filter_patchDmitriy Zaporozhets2015-05-082-2/+7
|\ \ | | | | | | Fix Firefox problems when it wants to render issuable component
| * | Fix Firefox problems when it wants to render issuable componentdreis2015-05-052-2/+7
| | |
* | | Merge branch 'show_project_visibility' into 'master'Dmitriy Zaporozhets2015-05-082-2/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | Move project visibility from clone bar to repository details block for non empty project. See merge request !1818
| * | Move project visibility from clone bar to repository details block for non ↵Marin Jankovski2015-05-082-2/+4
|/ / | | | | | | empty project.
* | 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 hooks
| | * | 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
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | How to reset your root password Added link and file correctly on Security doc. Please review to make sure it's correct. See merge request !1811
| * | | 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 migration See merge request !630
| * | | | 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 documentation See merge request !627
| * | | | Fix link to the CI documentationValery Sizov2015-05-081-1/+1
|/ / / /
* | | | Merge branch 'backup_doc' into 'master'Sytse Sijbrandij2015-05-081-7/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Improved the backup documentation See merge request !621
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use task_list gem for task lists Task Lists can now be used in comments, and they'll render in previews. :clap: Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271 See merge request !599
| * | | | | Add CHANGELOG entry for latest task listsrs-task_listRobert Speicher2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jasmine-rails still requires it as a dependency, but for some reason running `rake jasmine:ci` produced test failures but `rake spec:javascript` didn't.
| * | | | | 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
| | | | | |