summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \
| | * | | | Conditionally remove indices that may not exist in pre-GitLab v6.7 installationsStan Hu2015-05-081-2/+9
| | |/ / /
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-0811-100/+51
|\ \ \ \ \
| * \ \ \ \ Merge pull request #9254 from gitlabhq/revert-8800-email-settingsDmitriy Zaporozhets2015-05-0811-100/+51
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Revert "Allow to configure smtp and sendmail in gitlab.yml"Dmitriy Zaporozhets2015-05-0611-100/+51
* | | | | | Merge branch 'sidekiq-memory-killer-shutdown-signal' into 'master'Job van der Voort2015-05-083-5/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env varJacob Vosmaer2015-05-073-5/+9
* | | | | | Merge branch 'new-issue-after-release' into 'master'Marin Jankovski2015-05-081-1/+2
|\ \ \ \ \ \
| * | | | | | new issue after releaseJob van der Voort2015-05-071-1/+2
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-05-083-17/+30
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #9239 from Soullivaneuh/git-clone-holderJeroen van Baarsen2015-05-073-17/+30
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Fix bootlint issues on git clone holder barSullivan SENECHAL2015-05-073-17/+30
| |/ / / / / /
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-05-088-17/+86
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'rs-fix-filter-tooltips' into 'master'Robert Speicher2015-05-071-4/+8
| |\ \ \ \ \
| | * | | | | Fix tooltips for event filter linksrs-fix-filter-tooltipsRobert Speicher2015-05-061-4/+8
| | |/ / / /
| * | | | | Merge branch 'feature/handle-big-diffs' into 'master'Douwe Maan2015-05-075-10/+75
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Improve handling of large diffsAlex Lossent2015-05-055-10/+74
| * | | | | revert to 7.10.1Job van der Voort2015-05-071-3/+3
View Lorry Controller Status