summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | 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
| | | | | | |
| * | | | | | 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 duplicates Prevention of getting this error: ``` ActiveRecord::RecordNotUnique: PG::Error: ERROR: could not create unique index "index_tags_on_name" DETAIL: Key (name)=(XSS') is duplicated. : CREATE UNIQUE INDEX "index_tags_on_name" ON "tags" ("name") ``` This migration fails if there are duplicates: https://github.com/mbleigh/acts-as-taggable-on/blob/v3.5.0/db/migrate/2_add_missing_unique_indices.rb#L3 See merge request !623
| | * | | | | | | 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 supported MySQL tables had a collation type of utf8_ci, which makes the name case-insensitive. Previously this migration was run only after indices were built, but it needs to happen before if there is existing data that is case-sensitive. This is an idempotent change, so applying it again in the existing migration (20150425164651) should not change anything. This is related to !623, but this migration should run before that one. * Closes #1589 * Closes https://github.com/gitlabhq/gitlabhq/issues/9255 See merge request !625
| | * | | | | | | Change the MySQL collation type to utf8_bin to ensure case-sensitive tags ↵Stan Hu2015-05-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are supported
| * | | | | | | | 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 installations In pre-GitLab v6.7 installations, the `tagging` indices were directly added to the init schema and not added in a migration. Anyone using this older DB schema may not have these indicies, so only remove them if they are there. Closes #1593 See merge request !626
| | * | | | | | | Conditionally remove indices that may not exist in pre-GitLab v6.7 installationsStan Hu2015-05-081-2/+9
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Closes #1593
* | | | | | | | 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"
| | * | | | | | | 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 var It looks like SIGTERM may not be enough to shut down a Sidekiq process when its RSS has gotten too big. This change will allow us to experiment with sending SIGKILL instead of SIGTERM to Sidekiq processes on gitlab.com. See merge request !1812
| * | | | | | | | Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env varJacob Vosmaer2015-05-073-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like SIGTERM may not be enough to shut down a Sidekiq process when its RSS has gotten too big. This change will allow us to experiment with sending SIGKILL instead of SIGTERM to Sidekiq processes on gitlab.com.
* | | | | | | | | Merge branch 'new-issue-after-release' into 'master'Marin Jankovski2015-05-081-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new issue after release See merge request !1810
| * | | | | | | | | 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 bar
| | * | | | | | | | | 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 links See merge request !618
| | * | | | | | | | 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 diffs Diffs with a large number of changed lines time out (504 HTTP error) or generate a HTML page that's so heavy web browsers struggle with it. https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on commit line count so that only a safe portion is rendered. This was later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab. This patch re-introduces a safe limit on number of lines. See merge request !539
| | * | | | | | | Improve handling of large diffsAlex Lossent2015-05-055-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diffs with a large number of changed lines time out (504 HTTP error) or generate a HTML page that's so heavy web browsers struggle with it. https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on commit line count so that only a safe portion is rendered. This was later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab. This patch re-introduces a safe limit on number of lines.
| * | | | | | | | revert to 7.10.1Job van der Voort2015-05-071-3/+3
| | | | | | | | |
View Lorry Controller Status